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

3079 Commits

Author SHA1 Message Date
Sylvain
4298b74b7c fixes development readme to use .env instead of application.yml
Also:
- Updated links in Vagrantfile
- Applied some basic rubocop rules to the Vagrantfile
2020-04-29 17:41:11 +02:00
Sylvain
8e4396c37a
Merge pull request #202 from sleede/l10n_dev
New Crowdin translations
2020-04-29 17:13:14 +02:00
Sylvain
ad52f825fa
Merge branch 'dev' into l10n_dev 2020-04-29 17:12:51 +02:00
Sylvain
4566838965 New translations app.admin.en.yml (Spanish) 2020-04-29 17:07:21 +02:00
Sylvain
a58cf8a219 New translations app.admin.en.yml (Portuguese) 2020-04-29 17:07:20 +02:00
Sylvain
27438701eb New translations app.public.en.yml (Spanish) 2020-04-29 17:07:15 +02:00
Sylvain
6d11bfc57e New translations app.public.en.yml (Portuguese) 2020-04-29 17:07:14 +02:00
Sylvain
2b5f14ee0a New translations app.public.en.yml (French) 2020-04-29 16:55:26 +02:00
Sylvain
a6c5e5c2f3 New translations app.public.en.yml (French) 2020-04-29 16:54:10 +02:00
Sylvain
c19425f32e New translations app.public.en.yml (Spanish) 2020-04-29 16:54:08 +02:00
Sylvain
4d50f7270d New translations app.public.en.yml (Portuguese) 2020-04-29 16:54:06 +02:00
Sylvain
fae69d0a00 New translations app.public.en.yml (Zulu) 2020-04-29 16:54:05 +02:00
Sylvain
a4d8c893ab New translations app.admin.en.yml (French) 2020-04-29 16:53:56 +02:00
Sylvain
3bc8e69cf0 fix typo 2020-04-29 16:52:57 +02:00
Sylvain
c2e6be3de0 New translations app.admin.en.yml (French) 2020-04-29 16:33:30 +02:00
Sylvain
81e5395b12 New translations app.admin.en.yml (Spanish) 2020-04-29 16:33:29 +02:00
Sylvain
c4ff2772cd New translations app.admin.en.yml (Portuguese) 2020-04-29 16:33:26 +02:00
Sylvain
28b1c34658 New translations app.public.en.yml (French) 2020-04-29 16:33:22 +02:00
Sylvain
8a5742b0dc New translations app.public.en.yml (Spanish) 2020-04-29 16:33:20 +02:00
Sylvain
fb55213586 New translations app.public.en.yml (Portuguese) 2020-04-29 16:33:19 +02:00
Sylvain
ecd92e12c1 New translations app.public.en.yml (Zulu) 2020-04-29 16:33:17 +02:00
Sylvain
5f46865c1e New translations app.admin.en.yml (Zulu) 2020-04-29 16:33:13 +02:00
Sylvain
b97ff2ec5b improved feature tour for managers 2020-04-29 16:30:39 +02:00
Sylvain
6aa7ba89e8 manager's notifications 2020-04-29 15:34:30 +02:00
Sylvain
ff9636e12f help tour for managers 2020-04-29 15:20:39 +02:00
Sylvain
59a20d71bd corrected the documentation about BOOK_SLOT_AT_SAME_TIME
Also: [ongoing] help for managers
2020-04-29 12:57:17 +02:00
Sylvain
68fd322398 managers: edit user/edit subscription 2020-04-29 11:11:57 +02:00
Sylvain
35ce577651 [bug] subscription page shows the groups without any active plans
[bug] cart price inconsistently updated after a subscription
[feature] plans page for managers
2020-04-29 10:57:32 +02:00
Sylvain
05479e043c [ongoing] plans interface for managers 2020-04-28 18:11:25 +02:00
Sylvain
81a18704ed [bug] plan edition does not show the associated group 2020-04-28 18:10:12 +02:00
Sylvain
abcf17d1e6 invoices interface for managers 2020-04-28 16:49:05 +02:00
Sylvain
6a8746b110 [bug] updating a setting without any changes triggers an error
Also:
- Invoices interface for managers
- Refactoring of admin/invoices template: split into multiple files
2020-04-28 16:35:54 +02:00
Sylvain
18895b6a85 manager can create memebrs & credit wallets 2020-04-28 15:34:17 +02:00
Sylvain
e4f5a0f833 restricted manager view on users 2020-04-28 13:20:12 +02:00
Sylvain
2897c4c20d Merge branch 'manager' of git.sleede.com:projets/fab-manager into manager 2020-04-28 12:49:10 +02:00
Sylvain
3e177b5177 managers events views 2020-04-28 12:48:03 +02:00
Sylvain
e56fba1c03 [bug] Free entry label for events without reservation 2020-04-28 11:21:04 +02:00
Sylvain
f6c5a75811 [bug] Free entry label for events without reservation 2020-04-28 11:20:12 +02:00
Sylvain
2da644ecd5 [bug] unable to delete an unreserved event 2020-04-28 10:05:28 +02:00
Sylvain
3624bee057 {bug] unable to create events or trainings that are not multiples of SLOT_DURATION 2020-04-28 09:45:12 +02:00
Sylvain
570672c5db [bug] unable to change group if the previous was deactivated 2020-04-28 09:21:33 +02:00
Sylvain
102709246f basic access to members management for managers 2020-04-27 17:48:13 +02:00
Sylvain
8c610ea336 [managers] trainings management 2020-04-27 17:28:11 +02:00
Sylvain
d376aa400c book slot at same time for managers 2020-04-27 16:44:56 +02:00
Sylvain
69c8d7c678 manager can change existing reservations 2020-04-27 12:58:55 +02:00
Sylvain
5312c13d3f [manager] manage agenda + book machines for himself&others 2020-04-27 12:12:29 +02:00
Sylvain
c45c92e86a basic manager menu 2020-04-22 12:31:44 +02:00
Sylvain
c30ae8179e fix groups and tags in manager creation + helpers to get users w/ role partner|manager 2020-04-22 10:46:46 +02:00
Sylvain
e1a8646e5f inteface to add/remove/edit managers 2020-04-22 10:09:16 +02:00
Sylvain
91165d0432 Merge branch 'dev' into manager 2020-04-22 09:39:37 +02:00