1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Commit Graph

6339 Commits

Author SHA1 Message Date
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
Sylvain
859960ce3e confirmation on event filter deletion 2016-06-30 09:34:26 +02:00
Sylvain
eb7ee6300e remove associations with events on filter deletion 2016-06-29 17:26:41 +02:00
Sylvain
e13870555b ability to link filters to events 2016-06-29 17:05:42 +02:00
Sylvain
09bcd7df2c do not display events filter if no values exists for this filter 2016-06-29 16:13:42 +02:00
Sylvain
bdda4cd7b0 [feature] ability to filter events by category, theme and age 2016-06-29 16:09:27 +02:00
Sylvain
6e5fd86ad3 fix tests for age_range 2016-06-29 11:23:21 +02:00
Sylvain
79b97eb113 [feature] manage event's age range 2016-06-29 11:21:21 +02:00
Sylvain
51cce7bbc3 [feature] manage event themes 2016-06-29 10:38:04 +02:00
Sylvain
9adc219edb [feature] manage events categories 2016-06-28 17:06:33 +02:00
Sylvain
cbbd697d38 age_range & theme for event model 2016-06-28 15:56:37 +02:00
Sylvain
4d4248bcca Merge branch 'dev' into events
Conflicts:
	db/seeds.rb
2016-06-28 14:18:15 +02:00
Sylvain
99aa8120fc i18n statistics 2016-06-28 14:07:59 +02:00
Sylvain
9000305a11 fix missing translation in API doc 2016-06-28 11:57:04 +02:00
Sylvain
7d02fa9d9a rename Courses/Workshops to Events 2016-06-28 11:42:20 +02:00
Sylvain
59efdcf880 Merge branch 'dev' for release 2.3.0 2016-06-28 10:23:57 +02:00
Sylvain
7126843eda updated changelog for 2.3.0 2016-06-28 10:23:39 +02:00
Sylvain
d5b06d08ad [feature] confirmation on project deletion 2016-06-28 10:02:36 +02:00
Sylvain
6df3c90da2 fix api doc link 2016-06-27 18:08:19 +02:00
Sylvain
841c2dfd3a Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2016-06-27 17:23:16 +02:00
Sylvain
f6f539d2fc link to openAPI documentation in front interface 2016-06-27 17:23:05 +02:00
cyril
fb73fc23de fix ui:list openapi 2016-06-27 17:08:18 +02:00
Sylvain
8c90eab8ac updated changelog with TODO DEPLOY 2016-06-27 16:42:27 +02:00
Sylvain
875e513f1c Merge remote-tracking branch 'origin/open-api' into dev 2016-06-27 16:31:50 +02:00
Sylvain
cb3bd229a3 fix navigation flow in trainings 2016-06-27 15:47:13 +02:00
Sylvain
8e07460deb [feature] redirect to slugged-url on publish project 2016-06-27 15:34:08 +02:00
Sylvain
7bb724ce88 hide 'all trainings' button when already toggeled 2016-06-27 15:05:11 +02:00
Sylvain
05fa32cdd4 [feature] per training planning w/ ability to switch back to global view 2016-06-27 15:00:28 +02:00
Peng DU
a4fcede638 fix bug: cant get member training availability 2016-06-27 13:38:50 +02:00
Peng DU
4eea18a479 fix merge 2016-06-27 12:49:20 +02:00
Peng DU
6db26e7a19 fix conflt 2016-06-27 12:47:03 +02:00
Peng DU
df8dbfae8c fix conflt of changelog 2016-06-27 12:42:57 +02:00
Peng DU
07f231cb1f update changelog 2016-06-27 12:41:54 +02:00
Peng DU
b477353286 cancel cache for plant and training_prcings 2016-06-27 12:37:44 +02:00
Peng DU
68e45c0460 cache last event and optimise last subscript api 2016-06-27 10:55:51 +02:00
Sylvain
d313d7ff87 fix training reserve button 2016-06-27 10:28:30 +02:00
Sylvain
16997a2ce5 [feature] details public page for a training 2016-06-27 10:23:14 +02:00
Sylvain
9ab28c1df6 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2016-06-27 09:14:36 +02:00
Sylvain
b08ab236dc [bug] Unable to run migrations if postgre unaccent was already active 2016-06-27 09:12:16 +02:00
Sylvain
793b8e145b fix seeds for trainings 2016-06-27 09:11:51 +02:00
Sylvain
a12c26e06c [bug] Unable to run if postgre unaccent was already active 2016-06-27 09:10:33 +02:00
Peng DU
0bb4665b4a avoid N+1 for users list 2016-06-24 18:43:22 +02:00
Peng DU
d64e8a291b remove order for avoid N+1 2016-06-24 18:36:36 +02:00
Peng DU
702e35650f event cache 2016-06-24 18:26:11 +02:00