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

202 Commits

Author SHA1 Message Date
Du Peng
84a9e42161 Merge branch 'family_compte_pre_inscription' into dev 2023-09-25 12:09:45 +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
Nicolas Florentin
7925040d33 manager can configure his notifications 2023-09-01 14:39:53 +02:00
Du Peng
6b183969c7 Merge branch 'reservation-context' into dev 2023-08-24 10:37:53 +02:00
Du Peng
cfe2cbdda1 (bug) 403 error when manager edit an event 2023-08-01 10:47:56 +02:00
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Du Peng
d271fa59e6 (feat) valid/invalid pre registration event 2023-07-11 10:36:44 +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
0f9a5ff8af (feat) validate pre-registration reservation 2023-07-04 15:05:36 +02:00
Du Peng
219e7f5913 (wip) add pre-registration to event 2023-07-04 15:02:36 +02:00
Du Peng
ec1a736601 (feat) child validation 2023-07-04 15:01:06 +02:00
Du Peng
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
e85e2d7b47 (wip) pay family and nominative event 2023-07-04 14:59:00 +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
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
Sylvain
892ffbe138 (quality) rename proof-of-identity to supporting-document 2023-02-15 10:30:13 +01:00
Karen
10473182d4 (feat) Admin can control its notifications preferences 2023-02-15 10:30:08 +01:00
Karen
0f6f763814 (feat) add custom banner on events 2023-02-15 10:29:58 +01:00
Sylvain
bfe0936b40 (feat) save both operator/customer for orders 2023-02-15 10:29:50 +01:00
Sylvain
48a44ff4f3 (feat) create cart items from the api 2023-02-15 10:29:50 +01:00
Karen
0778616345 (feat) add a custom banner for trainings 2023-02-15 10:28:13 +01:00
Karen
5658e0aeed (feat) create settings for machines banner backend 2023-02-15 10:28:08 +01:00
Karen
4aba30c5e3 (feat) project statuses api 2023-02-15 10:27:13 +01:00
Sylvain
04f933f94d (bug) deal with DST using Time instead of DateTime 2023-02-14 13:10:58 +01:00
Sylvain
029eb90d78 (feat) soft-destroy a reserved event 2023-01-20 08:53:37 +01:00
Sylvain
68e5f6dc20 (security) restrict access to stats endpoint 2023-01-09 13:13:24 +01:00
Sylvain
43f45c383f (feat) cancel subscription 2023-01-03 17:17:39 +01:00
Sylvain
574974c239 (merge) Merge branch 'machine_category' into staging 2022-12-27 10:59:36 +01:00
Sylvain
4b84963d7f (feat) optional external id 2022-12-21 14:14:29 +01:00
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +01:00
Sylvain
509dd0eb5f (feat) soft destroy machines/spaces 2022-11-22 14:17:25 +01:00
Sylvain
7c7ec0aa4c (feature) admin can buy product for himself 2022-11-04 12:18:04 +01:00
Du Peng
6d448e0af2 (merge) merge dev and product-store 2022-10-26 09:37:31 +02:00
Sylvain
c9901a89e1 (test) test admin reserves for himself 2022-10-25 14:31:31 +02:00
Du Peng
9834faf120 (bug) cant load order withdrawal instructions if no login 2022-10-13 17:57:26 +02:00
Du Peng
ef3b876bd0 (feat) disable create card if store hidden 2022-10-13 17:56:34 +02:00
Sylvain
11c8b25357 (feat) hide the store to members/visitors 2022-10-12 16:48:39 +02:00
Sylvain
f80aec1ef2 (merge) Merge branch 'product-store_stats' into product-store 2022-10-12 14:20:38 +02:00
Du Peng
ef9a5c22bb (feat) clone a product 2022-10-11 18:53:12 +02:00
Sylvain
d9e8d0e40d (wip) report store statistics in UI 2022-10-11 17:23:45 +02:00
Sylvain
0464aae23e (quality) compute withdrawal instructions server side 2022-10-05 12:06:35 +02:00
Sylvain
3a8082db97 (merge) Merge remote-tracking branch 'origin/product-store_cart' into product-store 2022-10-04 09:41:47 +02:00