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

494 Commits

Author SHA1 Message Date
Sylvain
cfedb643b5 fix angular router file 2018-11-20 12:57:10 +01:00
Sylvain
74b6afd166 fix ERB JS controllers 2018-11-20 12:26:06 +01:00
Sylvain
aac0e8125c [ongoing] fix erb js controllers 2018-11-19 16:52:48 +01:00
Sylvain
185ea30db3 Merge branch 'erb' into es6 2018-11-19 16:20:46 +01:00
Sylvain
6352087f70 fix comments in erb files 2018-11-19 16:17:49 +01:00
Sylvain
12f74d5d08 fixed javascript for events controllers 2018-11-07 16:37:28 +01:00
Sylvain
39b18933b6 fixed javascript for application controller 2018-11-07 16:36:10 +01:00
Sylvain
e7031c90d5 restablished erb files 2018-10-25 17:08:13 +02:00
decaffeinate
5da4bf6317 decaffeinate: Run post-processing cleanups on about.coffee and 95 other files 2018-10-25 16:51:20 +02:00
decaffeinate
2c4dd31869 decaffeinate: Convert about.coffee and 95 other files to JS 2018-10-25 16:50:16 +02:00
decaffeinate
c4a2635cd9 decaffeinate: Rename about.coffee and 95 other files from .coffee to .js 2018-10-25 16:49:04 +02:00
Sylvain
944fa5f9b9 fixed erb syntax for decaffeinate 2018-10-25 13:10:39 +02:00
Sylvain
41847d75a2 removed erb suffixes 2018-10-25 13:06:09 +02:00
Sylvain
8d4b354199 [bug] change group button overflow 2018-10-15 16:51:44 +02:00
Sylvain
2126a199e0 Ability to set a neutral gender for the fablab's title (#108) 2018-09-18 16:40:50 +02:00
Sylvain
1e3066f6f4 Ability to parametrize machines order on the booking page 2018-09-18 15:30:54 +02:00
Sylvain
a26e8edf19 fix rendering issues in settings 2018-09-18 14:38:43 +02:00
Sylvain
1b33f3c865 display the machine reservation user name to other members 2018-07-24 12:24:51 +02:00
Sylvain
05bd65dfb2 migrate es api: top 10 aggregations 2018-07-12 11:26:13 +02:00
Sylvain
17b7e96b67 [ongoing] fix top 10 aggregation 2018-06-12 12:59:23 +02:00
Sylvain
38551e8ac2 [ongoing] migrate es api: graphs (see FIXME) 2018-06-08 17:22:03 +02:00
Sylvain
f66ca9165e migrate es api: statistics 2018-06-08 12:27:11 +02:00
Sylvain
697ea87e37 [bug] unable to filter statistics from age 0 2018-06-08 12:06:22 +02:00
Nicolas Florentin
a29ba926c0 fix events/index order, frontend js code was conflicting with server-side behaviour 2017-12-18 16:15:38 +01:00
Nicolas Florentin
2f4dd4642a adds polyfill for Object.assign, fix for IE11 2017-12-18 14:54:46 +01:00
Sylvain
e091b81187 fix events pagination 2017-12-13 15:20:51 +01:00
Sylvain
12c6cd2a70 Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
2017-11-20 11:43:40 +01:00
Sylvain
497ad71591 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-11-02 15:34:09 +01:00
Sylvain
73a62bd9a0 [feature] allow setting decimal prices 2017-11-02 15:33:56 +01:00
Sylvain
90fe4e313b hide reserve button on machine details page is machine is disabled 2017-10-16 14:04:55 +02:00
Sylvain
cc94a19ba6 hide disabled spaces in admin pricing area 2017-10-11 15:50:18 +02:00
Sylvain
02a155e7af prevent create availability for disabled space 2017-10-11 15:23:42 +02:00
Sylvain
1631e4ae5c hide disabled spaces & machines in public calendar 2017-10-11 15:18:44 +02:00
Sylvain
f8f45bcb69 filter and hide disabled spaces in list 2017-10-11 15:15:30 +02:00
Sylvain
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
02baf9097e hide disabled machine in admin pricing zone + prevent creating negative credits 2017-10-11 14:48:03 +02:00
Sylvain
ad288628cc hide disabled trainings in pricing admin zone 2017-10-11 13:09:52 +02:00
Sylvain
0ab01091cd prevent create availabilities for disabled machines 2017-10-11 13:02:54 +02:00
Sylvain
45465e8b59 prevent associate disabled machines w/ training 2017-10-11 13:00:46 +02:00
Sylvain
c9c7fe00c5 filter disabled machines in list + improve responsiveness 2017-10-11 12:54:13 +02:00
Sylvain
c67360771a ability to disable machine 2017-10-11 12:10:05 +02:00
Sylvain
41eef71ead fix c/p issue + prevent link disabled training to user 2017-10-11 11:40:21 +02:00
Sylvain
4d7a317315 prevent create new availability with disabled training 2017-10-10 18:17:22 +02:00
Sylvain
0e38574ef8 hide disabled trainings in public calendar 2017-10-10 18:13:30 +02:00
Sylvain
4752fce762 disable required training modal for machines associated with disabled trainings 2017-10-10 18:12:07 +02:00
Sylvain
4090fe2119 filter trainings list by status 2017-10-10 17:38:01 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
14592c1e18 prevent user from switching to disabled group 2017-10-10 16:30:28 +02:00
Sylvain
33b146d243 hide disabled groups 2017-10-10 15:44:17 +02:00
Sylvain
189665e53b [ongoing] prevent disable group with users + [ongoing] hide disabled groups 2017-10-05 17:54:44 +02:00