Sylvain
|
68f9324725
|
Merge branch 'steps' into dev
Conflicts:
app/assets/javascripts/controllers/projects.coffee.erb
db/schema.rb
|
2016-07-13 16:10:18 +02:00 |
|
Sylvain
|
a45a648b4a
|
updated changelog
|
2016-07-13 16:05:13 +02:00 |
|
Sylvain
|
3d7b0bbdfc
|
Merge remote-tracking branch 'origin/machines' into dev
|
2016-07-13 16:03:12 +02:00 |
|
Sylvain
|
320999e9f9
|
updated changelog
|
2016-07-13 16:02:29 +02:00 |
|
Sylvain
|
2c8001f38f
|
Merge branch 'projects' into dev
Conflicts:
app/views/api/members/show.json.jbuilder
|
2016-07-13 15:57:45 +02:00 |
|
Sylvain
|
c863975e9c
|
statistics tables: sort by date
|
2016-07-13 11:12:16 +02:00 |
|
Sylvain
|
ad19bfbd79
|
fix custom filter CA=0
|
2016-07-13 10:19:43 +02:00 |
|
Sylvain
|
cbeb78fd7e
|
fix members full export
|
2016-07-13 09:20:52 +02:00 |
|
Sylvain
|
3413c3040b
|
[ongoing] members export full infos
|
2016-07-12 17:46:19 +02:00 |
|
Sylvain
|
b489b5d270
|
change export links to xlsx
|
2016-07-12 13:41:19 +02:00 |
|
Sylvain
|
bfe04c8be6
|
export reservations: eager load reservables
|
2016-07-12 13:38:35 +02:00 |
|
Sylvain
|
1b17290395
|
optimize export subscriptions & reservations queries
|
2016-07-12 13:16:29 +02:00 |
|
Sylvain
|
827b3334e1
|
migrate export subscriptions to axlsx
|
2016-07-12 13:10:06 +02:00 |
|
Sylvain
|
85912603a2
|
migrate export reservations to axlsx
|
2016-07-12 13:00:56 +02:00 |
|
Sylvain
|
d72e39f716
|
migrate export members to axlsx
|
2016-07-12 12:48:26 +02:00 |
|
Sylvain
|
d84238b331
|
statistics: global export to excel
|
2016-07-12 12:03:38 +02:00 |
|
Sylvain
|
569cc1b737
|
use theme primary in export header
|
2016-07-07 17:15:54 +02:00 |
|
Sylvain
|
8e968f7813
|
fix type key transmission
|
2016-07-07 16:57:23 +02:00 |
|
Sylvain
|
0f7f2c256a
|
[export] handle data type in custom fields
|
2016-07-07 16:34:28 +02:00 |
|
Sylvain
|
022db4e486
|
export all stats indices to excel
|
2016-07-07 16:26:25 +02:00 |
|
Sylvain
|
8e8bd3f9eb
|
full subscriptions export
|
2016-07-07 15:31:22 +02:00 |
|
Sylvain
|
eec004d1ba
|
cancel button does not trigger the generation
|
2016-07-06 19:04:04 +02:00 |
|
Sylvain
|
b0f7c634ea
|
subscriptions export with all rows
|
2016-07-06 19:00:22 +02:00 |
|
Sylvain
|
e8b1c99d2a
|
Alleluia git add . Downloading xls from front is working
|
2016-07-06 15:53:09 +02:00 |
|
Peng DU
|
40038f571c
|
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
|
2016-07-06 11:22:05 +02:00 |
|
Peng DU
|
e57d5c96e6
|
cancel cache machine index json
|
2016-07-06 11:22:01 +02:00 |
|
Sylvain
|
d307f91983
|
use an hidden form to post export data
|
2016-07-05 17:23:14 +02:00 |
|
Sylvain
|
4dcab27af2
|
API generate valid xlsx files
|
2016-07-05 16:13:11 +02:00 |
|
Sylvain
|
b26bbd18ef
|
API accessing service & conforming server-side access points
|
2016-07-05 12:21:55 +02:00 |
|
Sylvain
|
38c00391fc
|
basic UI and API for exporting stats to excel
|
2016-07-04 17:15:37 +02:00 |
|
Sylvain
|
1e235d3791
|
add missing translations for training form error messages
|
2016-07-04 16:44:01 +02:00 |
|
Sylvain
|
683bc835df
|
[bug] statistics: sum of stats does not work
|
2016-07-04 12:53:56 +02:00 |
|
Sylvain
|
ee229a4e4b
|
move 'all trainings' button to top bar
|
2016-07-04 12:32:13 +02:00 |
|
Sylvain
|
8ba797bbf2
|
add filters in event index view
|
2016-07-04 11:11:00 +02:00 |
|
Sylvain
|
5af4c0b9d5
|
fix articles image height
|
2016-07-04 10:53:09 +02:00 |
|
Sylvain
|
3f6890825b
|
fix events index: box sizes
|
2016-07-04 10:39:24 +02:00 |
|
Sylvain
|
981999c29f
|
simplify event view in index if event on a single day
|
2016-06-30 16:56:13 +02:00 |
|
Sylvain
|
abb91458b1
|
display filters infos in event show
|
2016-06-30 16:45:47 +02:00 |
|
Sylvain
|
fda619e422
|
add info message on categories management + fix existing categories slugs
|
2016-06-30 16:12:24 +02:00 |
|
Sylvain
|
894f836286
|
fix the 'load more events' button
|
2016-06-30 15:26:34 +02:00 |
|
Sylvain
|
471fe971bc
|
remove course & workshop from seeds file
|
2016-06-30 15:13:58 +02:00 |
|
Sylvain
|
5750aec326
|
updated changelog
|
2016-06-30 14:20:17 +02:00 |
|
Sylvain
|
0557cb991f
|
rake task for correct event statistics mapping in elastic
|
2016-06-30 14:14:46 +02:00 |
|
Sylvain
|
e930e04ed6
|
add age&theme filters to statistics
|
2016-06-30 12:48:46 +02:00 |
|
Sylvain
|
5a0bb86394
|
fix events pagniation
|
2016-06-30 12:41:47 +02:00 |
|
Sylvain
|
e36df94f0f
|
server-side protection against deleting used filters
|
2016-06-30 11:39:56 +02:00 |
|
Sylvain
|
c8b42f1b7f
|
add slugs to event filters + add categories into statistics + prevent remove linked elements in front
|
2016-06-30 11:24:57 +02:00 |
|
Sylvain
|
812d7a3c05
|
server-side protection against last category deletion
|
2016-06-30 09:57:40 +02:00 |
|
Sylvain
|
bb6295c487
|
prevent from removing the last category
|
2016-06-30 09:51:06 +02:00 |
|
Sylvain
|
5374d8d0a6
|
event form: do not display filters with no values
|
2016-06-30 09:43:24 +02:00 |
|