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

3313 Commits

Author SHA1 Message Date
Du Peng
3bf30cf3a4 (i18n) update translates 2023-09-25 12:57:24 +02:00
Du Peng
84a9e42161 Merge branch 'family_compte_pre_inscription' into dev 2023-09-25 12:09:45 +02:00
Du Peng
f2e7cd0fdc (i18n) update translations 2023-09-19 10:08:09 +02:00
Du Peng
9674234b59 (i18n) update translations 2023-09-14 15:40:28 +02:00
Nicolas Florentin
ba8a8e5f1b admin can see reservations of a member 2023-09-14 09:13:40 +02:00
Du Peng
12b1ff5f0e Merge branch 'pre_inscription' into family_compte_pre_inscription 2023-09-11 17:59:14 +02:00
Du Peng
16925bf129 (i18n) update translations 2023-09-11 17:08:43 +02:00
Du Peng
33d81c6c36 (feat) add a notification to remind users to upload their supporting documents 2023-09-11 15:52:05 +02:00
Du Peng
fb2b762015 Merge branch 'spaces-machines-tree' into dev 2023-09-11 09:54:08 +02:00
Vincent
aad5da63be (i18n) Typo 2023-09-11 09:15:00 +02:00
Du Peng
e4bd077907 (feat) Add extra_authorize_params to OpenIdConnect config 2023-09-07 16:22:57 +02:00
Nicolas Florentin
a72c2e580c improves api/notification controller to avoid failing when there is a notification with wrong notification_type in db 2023-09-07 10:30:48 +02:00
Nicolas Florentin
b458f03e43 add a notification to remind users to upload their supporting documents 2023-09-05 11:15:12 +02:00
Du Peng
e3dc47889b (i18n) update translations 2023-09-01 15:46:51 +02:00
Nicolas Florentin
4f75a2c20e adds missing translation 2023-09-01 12:43:59 +02:00
Du Peng
a10f3cffe4 (feat) statistics improvements 2023-09-01 12:43:36 +02:00
Nicolas Florentin
fcfa4f018b Feature: add a filter in members list (admin) to show only "not validated" members 2023-08-30 11:56:24 +02:00
Du Peng
e18b34be3a (i18n) update translations 2023-08-28 18:33:50 +02:00
Du Peng
e9346afed2 (i18n) update translations 2023-08-24 18:31:56 +02:00
Du Peng
be69befb6b (feat) add adds coupon in statistic export 2023-08-24 18:31:16 +02:00
Nicolas Florentin
bdc5729141 (feat) space associate machines 2023-08-24 14:41:29 +02:00
Du Peng
6b183969c7 Merge branch 'reservation-context' into dev 2023-08-24 10:37:53 +02:00
Vincent
43bb6d2c1e (i18n) Fix typo 2023-08-22 19:09:59 +02:00
Du Peng
23faa559e3 (feat) reanme event family to event reserved for members 2023-07-31 15:10:16 +02:00
Du Peng
b62e9efd12 (i18n) update tranlations 2023-07-31 14:35:31 +02:00
Du Peng
8a3110cd0f (feat) add not valid status for event reservaiton 2023-07-26 15:48:14 +02:00
Du Peng
d5fa71e113 (bug) event pre-registration status 2023-07-25 18:53:12 +02:00
Vincent
06d917f7d3 (i18n) Update user profil form 2023-07-21 15:07:29 +02:00
Nicolas Florentin
f466826e8b Fix a bug: hide project categories filter if there is no project categories, Improvement : dialog confirm to remove a project category 2023-07-21 10:21:08 +02:00
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Du Peng
25d8b25808 (feat) add reservation status registered 2023-07-12 11:23:00 +02:00
Du Peng
b6f2187d94 (feat) add child age will be 18 worker 2023-07-12 09:29:16 +02:00
Du Peng
770d1edbe6 (i18n) update translations 2023-07-11 15:57:47 +02:00
Du Peng
e43d4918e1 (feat) show present status for pre registration evnet if amount == 0 2023-07-11 15:42:46 +02:00
Du Peng
61fbb37fb2 (feat) add invalidate pre registration notification 2023-07-11 14:57:38 +02:00
Du Peng
8b4150a888 (feat) show age of child in event reservation 2023-07-11 14:17:03 +02:00
Du Peng
8771eb8ccc (feat) admin can confirm the prensence of pre-registration event 2023-07-11 13:53:41 +02:00
Du Peng
d271fa59e6 (feat) valid/invalid pre registration event 2023-07-11 10:36:44 +02:00
Du Peng
e430ae14e2 (i18n) updated translations 2023-07-07 18:05:40 +02:00
Nicolas Florentin
751920893a translations for project filters 2023-07-06 14:28:46 +02:00
Vincent
a8dedfe040 (ui) Add radio buttons for event validation 2023-07-06 11:24:50 +02:00
Du Peng
6e014ddfe6 (i18n) update translations 2023-07-04 17:09:25 +02:00
Du Peng
8542c07dc7 (i18n) update translations 2023-07-04 15:05:49 +02:00
Du Peng
2319dbab11 (i18n) update translates 2023-07-04 15:05:48 +02:00
Du Peng
e15bbf0b15 (feat) re-make event reservation item view 2023-07-04 15:05:46 +02:00
Du Peng
524404e7fa (feat) some improvements for family account 2023-07-04 15:05:45 +02:00
Du Peng
ab35fdf976 (feat) new pre registration mail and notification 2023-07-04 15:05:44 +02:00
Du Peng
2a57a7e505 (feat) add success info after reservation is paid 2023-07-04 15:05:43 +02:00
Du Peng
83ced44741 (bug) cannot save pre registration end date is empty 2023-07-04 15:05:42 +02:00
Du Peng
26cf72a846 (feat) pre-register event for family compte and nominatif 2023-07-04 15:05:41 +02:00
Du Peng
a60e587187 (feat) admin can confirm the payment of pre-registration reservation 2023-07-04 15:05:40 +02:00
Du Peng
172f09661f (wip) admin confirm payment of reservation pre-registration 2023-07-04 15:05:39 +02:00
Du Peng
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
94e839f647 (feat) pre-book a event 2023-07-04 15:02:40 +02:00
Du Peng
219e7f5913 (wip) add pre-registration to event 2023-07-04 15:02:36 +02:00
Du Peng
a4d4107cb1 (i18n) update translation 2023-07-04 15:01:23 +02:00
Vincent
d4b2b16425 (ui) integration 2023-07-04 15:01:20 +02:00
Du Peng
e7bac208a7 (feat) child's supporting document file created/updated notification 2023-07-04 15:01:18 +02:00
Du Peng
d729ded4d5 (feat) add birthday alert for event reservation 2023-07-04 15:01:16 +02:00
Du Peng
387fc3ffb3 (feat) confirmation required for delete child 2023-07-04 15:01:13 +02:00
Du Peng
b577cd1ae2 (feat) child compte validation notification 2023-07-04 15:01:11 +02:00
Du Peng
562dfcb010 (feat) new child notification 2023-07-04 15:01:10 +02:00
Du Peng
d08e4ff9cd (feat) admin can refuse child's supporting document file 2023-07-04 15:01:09 +02:00
Du Peng
ec1a736601 (feat) child validation 2023-07-04 15:01:06 +02:00
Du Peng
07b47d7956 (wip) add event type 2023-07-04 14:58:58 +02:00
Du Peng
177748169a (wip) save booking user for event nominatif 2023-07-04 14:58:21 +02:00
Du Peng
9373f50706 (wip) event reservation naminative 2023-07-04 14:57:42 +02:00
Du Peng
39178b5d96 (wip) create/update user children 2023-07-04 14:56:34 +02:00
Du Peng
5365cbdaba (wip) add/edit user children 2023-07-04 14:56:33 +02:00
Du Peng
7d10132953 (feat) add Family account setting 2023-07-04 14:56:29 +02:00
Du Peng
212e044a6b (i18n) updated translations 2023-07-03 18:39:02 +02:00
Nicolas Florentin
b8fd8d8172 Merge remote-tracking branch 'origin/projects-to-markdown' into projects-improvements 2023-07-03 14:37:57 +02:00
Nicolas Florentin
a3a5527141 Merge branch 'project-categories' into projects-improvements 2023-07-03 14:32:35 +02:00
Nicolas Florentin
bc284e7813 filter projects by date 2023-07-03 11:42:29 +02:00
Nicolas Florentin
50ed3c9ed2 projects to markdown in zip 2023-06-30 11:15:37 +02:00
Nicolas Florentin
82823dd4cc download project to markdown file 2023-06-29 16:37:16 +02:00
Nicolas Florentin
97c652f785 filter projects list by member 2023-06-29 14:32:06 +02:00
Nicolas Florentin
8217bb1a59 adds project categories 2023-06-29 08:47:42 +02:00
Du Peng
b5f4d7a541 (i18n) update locales 2023-04-25 15:29:22 +02:00
Du Peng
c478e649be (i18n) Update translations from Crowdin 2023-04-12 15:47:57 +02:00
Du Peng
c552573d35 (i18n) Update translations from Crowdin 2023-04-12 15:21:25 +02:00
Vincent
994069a948 (i18n) Typo + update 2023-04-11 10:00:32 +02:00
Sylvain
0499d95566 (i18n) fix typo + updated italian translations 2023-04-07 09:52:42 +02:00
Sylvain
f33a0d7657 (bug) broken notifications 2023-04-05 11:31:38 +02:00
Sylvain
ef732f759b (i18n) updated italian translations 2023-04-05 10:50:06 +02:00
Sylvain
7e6e5e9dc4 (i18n) italian 2023-04-04 15:35:07 +02:00
Sylvain
7e71c8e3da (i18n) updated translations 2023-04-03 11:41:11 +02:00
Sylvain
66f740104a (feat) cache auth provider config 2023-03-29 18:01:16 +02:00
Sylvain
ffd7de0bcb (security) upgrade to rails 7 2023-03-28 12:44:00 +02:00
Sylvain
3cff0d4c28 (feat) generate invoices for missing references 2023-03-28 11:18:27 +02:00
Sylvain
71a9a87315 (feat) improved chaining system 2023-03-24 10:16:21 +01:00
Sylvain
1d15c3bfac (security) updated sentry & web-console 2023-03-22 17:01:46 +01:00
Sylvain
01df96dc20 (security) upgrade to rails 6 2023-03-22 10:58:22 +01:00
Sylvain
0ab998cb5b (i18n) updated translations 2023-03-20 10:40:10 +01:00
Sylvain
a24fe8cd71 Merge branch 'feature/each-reservation-deadlines' of https://github.com/Guichaguri/fab-manager into Guichaguri-feature/each-reservation-deadlines 2023-03-20 10:19:29 +01:00
Sylvain
98e58cbc25 (bug) fix invalid invoice reference 2023-03-20 10:13:42 +01:00
Vincent
abc5fa6691 (ui) Add label for user profil form gender field 2023-03-17 18:36:25 +01:00
Sylvain
328529809d (bug) plan visibility is not applied
(bug) plan limit error message
(quality) improved error message
(ui) plan visibility cannot be under 7
2023-03-16 12:02:08 +01:00
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
6089e636e4 (feat) limit machine visibility per plan 2023-03-15 14:17:06 +01:00