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 |
|
Sylvain
|
0be80ac729
|
allow usage of HTML in trainings description
|
2016-06-23 17:10:03 +02:00 |
|
Sylvain
|
45ab06c73c
|
trainings gallery
|
2016-06-23 16:47:15 +02:00 |
|
Sylvain
|
973d3637e3
|
i18n delete training
|
2016-06-23 13:18:00 +02:00 |
|
Sylvain
|
8bd4e6897d
|
fix redirect after training edition
|
2016-06-23 12:46:14 +02:00 |
|
Sylvain
|
4bb555f624
|
Merge branch 'dev'
|
2016-06-23 11:50:15 +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 |
|
Sylvain
|
7e1b05d339
|
updated ngUpload + [ongoing] fixing adding/updating training
|
2016-06-22 17:15:19 +02:00 |
|
Peng DU
|
4dff74827b
|
optimise machine/training availabilities query
|
2016-06-22 12:54:12 +02:00 |
|
Sylvain
|
7deefd0e57
|
add missing fields in training form
|
2016-06-22 11:25:48 +02:00 |
|
Sylvain
|
ef9907aa3c
|
Merge branch 'dev'
|
2016-06-22 09:19:55 +02:00 |
|
Sylvain
|
18c1f19840
|
updated changelog for v2.2.1
|
2016-06-22 09:19:40 +02:00 |
|
Nicolas Florentin
|
62ec8ff0dc
|
updates fabmanager bin
|
2016-06-22 09:18:57 +02:00 |
|
Peng DU
|
e82372fb7b
|
optimise machine availabilities query
|
2016-06-21 19:07:47 +02:00 |
|
Sylvain
|
ca73e83f7e
|
advanced training UI w/ i18n
|
2016-06-21 17:35:53 +02:00 |
|
Sylvain
|
9b8e3eba88
|
Merge branch 'stats' into dev
|
2016-06-21 17:11:40 +02:00 |
|
Sylvain
|
644a5a9d47
|
[ongoing][UI] advanced trainings management
|
2016-06-21 17:05:49 +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 |
|