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

2664 Commits

Author SHA1 Message Date
Sylvain
db26533d94 alert on date change 2020-02-11 15:42:43 +01:00
Du Peng
870a092a81 Merge branch 'slot_is_only_subscriptions' of git.sleede.com:projets/fab-manager into slot_is_only_subscriptions 2020-02-11 13:22:28 +01:00
Du Peng
096a658bac add a validator to check reservation's slot is or not restrict for subscriptions 2020-02-11 13:22:20 +01:00
Du Peng
760109de05 fix bug: cant reserve formation slot 2020-02-11 13:21:25 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Sylvain
392ddc6aa5 wording 2020-02-11 11:01:24 +01:00
Sylvain
54bcc392f3 typo and syntax 2020-02-11 10:48:29 +01:00
Du Peng
d9676b604c remove debug info 2020-02-10 11:53:20 +01:00
Du Peng
427725f927 fix bug: select plans error 2020-02-10 11:52:57 +01:00
Sylvain
ea9607521b translation issue on event reservation 2020-02-10 11:09:54 +01:00
Sylvain
aecbaa7f04 translation issue on event reservation 2020-02-10 11:09:22 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Du Peng
7c86adde4b Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time 2020-02-05 16:53:47 +01:00
Du Peng
767a8cd332 fix _t function in seed 2020-02-03 11:31:33 +01:00
Du Peng
c3965b28cf remove rebocop disable 2020-02-03 10:53:54 +01:00
Du Peng
05073d5a28 fix bug for update event recurrent 2020-01-30 12:03:50 +01:00
Sylvain
fd0f49f132 rubocop: ruby syntax 2020-01-29 17:50:06 +01:00
Sylvain
5b97ef03a9 rubocop: ruby syntax 2020-01-29 17:49:05 +01:00
Sylvain
b1a98d3574 improved texts 2020-01-29 17:44:17 +01:00
Du Peng
35d9bec8a5 update event recurrent 2020-01-29 17:20:19 +01:00
Du Peng
de02bb1c72 update all attributes of event 2020-01-28 18:34:32 +01:00
Sylvain
72f3d8fd1e updated crowdin in-context keys 2020-01-28 10:59:19 +01:00
Sylvain
3364dcf4d0 Merge branch 'dev' of github.com:sleede/fab-manager into dev 2020-01-28 10:40:24 +01:00
Sylvain
8e003d4d1d
Merge pull request #165 from sleede/l10n_dev
New Crowdin translations
2020-01-28 10:30:59 +01:00
Sylvain
81a42e5935 customize home page : full texts 2020-01-28 10:12:29 +01:00
Sylvain
8d8c9a8af5 fix double insertion of widgets button in home page editor 2020-01-28 09:24:55 +01:00
Sylvain
49b3a54afb allow display widgets multiple times on home page 2020-01-28 09:21:39 +01:00
Du Peng
b1419271e6 edit event recurrent in progress 2020-01-27 18:21:46 +01:00
Sylvain
656a603d6c customize home page css 2020-01-27 17:10:29 +01:00
Sylvain
22b6560baf moved supervisor conf to docker folder 2020-01-22 15:04:44 +01:00
Sylvain
37c90b1d54 ruby syntax 2020-01-22 14:34:45 +01:00
Sylvain
34a3286870 fix homepage layout 2020-01-22 14:16:35 +01:00
Sylvain
0459eb93d2 updated changelog 2020-01-22 13:27:16 +01:00
Sylvain
d0c4dd0caf Merge branch 'custom_home' into dev 2020-01-22 13:26:00 +01:00
Sylvain
898a18ed46 display customized home page html 2020-01-22 13:25:22 +01:00
Sylvain
75c49c06f2 move homepage components to standalone directives
- events
2020-01-22 12:52:51 +01:00
Sylvain
89e146d419 [ongoing] move homepage components to standalone directives
- twitter
- members
2020-01-22 12:43:08 +01:00
Sylvain
fd1778b465 renamed twitter template file 2020-01-22 12:24:45 +01:00
Sylvain
1968ba601d [ongoing] move homepage components to standalone directives 2020-01-22 12:23:51 +01:00
Sylvain
b85c7ac00b admin set its customized html template for the home page & can reset it to factory value 2020-01-22 11:53:40 +01:00
Sylvain
b1e6154cc9 POC for custom home page 2020-01-21 18:03:15 +01:00
Sylvain
15ab3c1305 Ability to customize the title of the link to the about page 2020-01-21 16:16:12 +01:00
Sylvain
45e4b5c4bc Create machine availabilities: select all/none in a click 2020-01-21 12:09:24 +01:00
Sylvain
939b4e3851 updated changelog 2020-01-21 11:45:49 +01:00
Sylvain
97660924cb fix typo and wording 2020-01-21 11:16:49 +01:00
Sylvain
146ba97766 Merge remote-tracking branch 'origin/reserve_slots_passed' into dev 2020-01-21 11:01:48 +01:00
Sylvain
57e5da61de remove unused helper 2020-01-21 11:01:23 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Du Peng
0143c3d495 allow admin reserve machine/space in the past time 2020-01-20 16:17:10 +01:00
Sylvain
bc2ad42c26 removed twitter gems 2020-01-17 08:46:45 +01:00