1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-22 11:52:21 +01:00

1369 Commits

Author SHA1 Message Date
Du Peng
7c703433ef Merge branch 'dev' into staging 2023-09-01 15:56:35 +02:00
Du Peng
f3b5e2b240 (bug) fix notification list is shown in notification settings page 2023-09-01 15:18:29 +02:00
Nicolas Florentin
7925040d33 manager can configure his notifications 2023-09-01 14:39:53 +02:00
Du Peng
a10f3cffe4 (feat) statistics improvements 2023-09-01 12:43:36 +02:00
Du Peng
35735a7405 Merge branch 'pre_inscription' into staging 2023-08-31 17:15:35 +02:00
Du Peng
fb12b52ec4 Merge branch 'dev' into staging 2023-08-31 17:14:36 +02:00
Du Peng
ad89e4f278 (bug) user cant book event after has reservation canceled 2023-08-31 17:11:18 +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
Vincent
0f7f32f256 (ui) change editorial-block cta target 2023-08-29 16:22:53 +02:00
Nicolas Florentin
ffaeb7e5c8 Fix a bug: for project categories, if there is no category : do not show categories panel in show view, do not show categories input field in edit view 2023-08-29 08:29:30 +02:00
Du Peng
b5f330ea5a Merge branch 'spaces-machines-tree' into staging 2023-08-24 15:03:46 +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
9000c97aaf (ui) Fix link 2023-08-22 19:10:08 +02:00
Vincent
803f144046 (ui) Fix link 2023-08-22 18:24:25 +02:00
Du Peng
e2765d5629 Merge branch 'pre_inscription' into staging 2023-07-31 15:11:11 +02:00
Du Peng
65a6a80670 (feat) add submiting to save event form 2023-07-31 15:10:46 +02:00
Du Peng
2025409741 Merge branch 'pre_inscription' into staging 2023-07-31 10:19:39 +02:00
Du Peng
91d263401a Merge branch 'dev' into staging 2023-07-31 10:19:25 +02:00
Du Peng
2a2c451d6e (bug) admin valid/pay event reservaiton error 2023-07-31 10:18:15 +02:00
Du Peng
cc46103eca (bug) family event nb free place error 2023-07-28 16:25:39 +02:00
Du Peng
4f26f52d85 (feat) hide child supporting document if dont any type of supporting document 2023-07-28 14:28:54 +02:00
Vincent
3139430761 (ui) Fix select dropdown z-index 2023-07-28 10:35:36 +02:00
Du Peng
c9f17309f9 (bug) child validited cannot reserve event 2023-07-27 17:54:34 +02:00
Du Peng
ea83265b87 (bug) child cannot be updated 2023-07-27 17:34:54 +02:00
Du Peng
af57e59ccd (bug) event canceled places error 2023-07-26 16:10:05 +02:00
Du Peng
8a3110cd0f (feat) add not valid status for event reservaiton 2023-07-26 15:48:14 +02:00
Du Peng
7340758f13 Merge branch 'pre_inscription' into staging 2023-07-25 18:53:50 +02:00
Du Peng
d5fa71e113 (bug) event pre-registration status 2023-07-25 18:53:12 +02:00
Du Peng
a6947f61f7 (merge) merge dev 2023-07-24 18:15:22 +02:00
Vincent
06d917f7d3 (i18n) Update user profil form 2023-07-21 15:07:29 +02:00
Nicolas Florentin
c0df547293 Merge branch 'reservation-context' into staging 2023-07-21 13:10:00 +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
Vincent
a4d6723413 (ui) Fix machines padding 2023-07-20 09:35:58 +02:00
Du Peng
2ceb4f1119 (bug) incorrect date range in statistics 2023-07-18 11:56:51 -04:00
Du Peng
e7a4ab2140 Merge branch 'pre_inscription' into staging 2023-07-12 15:07:31 +02:00
Du Peng
aa6aab48b2 (feat) admin cannot validate pre-registration > nb total places 2023-07-12 15:07:14 +02:00
Du Peng
a2a970cba4 (bug) cannot show event reservation success info 2023-07-12 14:46:30 +02:00
Du Peng
3b5e087b7a (feat) family compte setting in panel 2023-07-12 12:47:35 +02:00
Du Peng
25d8b25808 (feat) add reservation status registered 2023-07-12 11:23:00 +02:00
Du Peng
3f1d6bf378 (merge) merge branch pre_inscription 2023-07-12 09:34:09 +02:00
Du Peng
67f5e68fd7 (feat) user cannot reserve 2 times for event family 2023-07-11 19:13:38 +02:00
Du Peng
9dc85ee80b (bug) cannot create event 2023-07-11 16:07:37 +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
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
Vincent
a8dedfe040 (ui) Add radio buttons for event validation 2023-07-06 11:24:50 +02:00
Du Peng
b4f7ceb747 (merge) merge dev 2023-07-04 17:11:15 +02:00