rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity
351 Commits 15 Branches 273 Tags 82 MiB
bdda4cd7b0
Commit Graph

351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
8e07460deb [feature] redirect to slugged-url on publish project 2016-06-27 15:34:08 +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
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
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
Sylvain
98edd345b1 updated changelog for v2.2.2 2016-06-23 11:49:48 +02:00
Sylvain
9e728c691f [feature] prevent unmerged accounts (soo imported) from being displayed in lists/searches 2016-06-23 11:42:10 +02:00
Sylvain
c90f4684b9 [bug] scroll statistics tables not working when elastic is not localhost 2016-06-23 11:11:54 +02:00
Peng DU
60f504c660 event categoriy is required 2016-06-22 18:56:45 +02:00
Peng DU
1383483a54 dont compute member list if not complete 2016-06-22 17:28:04 +02:00
Peng DU
4dff74827b optimise machine/training availabilities query 2016-06-22 12:54:12 +02:00
Sylvain
18c1f19840 updated changelog for v2.2.1 2016-06-22 09:19:40 +02:00
Peng DU
e82372fb7b optimise machine availabilities query 2016-06-21 19:07:47 +02:00
Sylvain
9b8e3eba88 Merge branch 'stats' into dev 2016-06-21 17:11:40 +02:00
Peng DU
d65ecf437b cache training json 2016-06-21 17:02:44 +02:00
Peng DU
85a40db603 price cache 2016-06-21 16:04:44 +02:00
Sylvain
3138097be2 updated chagelog 2016-06-21 15:24:25 +02:00
Peng DU
4d0d3d6af0 optimise load plans json 2016-06-21 14:49:39 +02:00
Sylvain
3e24d328a9 [feature] statistics: username link leads to admin edition 2016-06-21 14:46:00 +02:00
Sylvain
24f963645b optimize usernames mapping in statistics 2016-06-21 14:39:44 +02:00
Sylvain
4639a15e2f [feature] paginate statistics 2016-06-21 13:16:42 +02:00
Peng DU
2df2d8796d add ngSanitize 2016-06-21 13:03:54 +02:00
Peng DU
8b699153cc update jbuilder and add cache in progress 2016-06-20 19:41:05 +02:00