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

435 Commits

Author SHA1 Message Date
Du Peng
78d8b3bfe6 (feat) show event reservation booking users in events of member dashbaord 2023-07-04 15:01:17 +02:00
Du Peng
d729ded4d5 (feat) add birthday alert for event reservation 2023-07-04 15:01:16 +02:00
Du Peng
f6883ea43e (feat) show event booking users in member edit page 2023-07-04 15:01:12 +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
3d542ce6d4 (feat) add supporting document for child 2023-07-04 14:59:42 +02:00
Du Peng
e935b23631 (wip) family account css 2023-07-04 14:59:02 +02:00
Du Peng
04795ba629 (wip) show event reservation users 2023-07-04 14:59:01 +02:00
Du Peng
e85e2d7b47 (wip) pay family and nominative event 2023-07-04 14:59:00 +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
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
Peng
bc320693cf Merge branch 'dev' into 'projects-improvements'
# Conflicts:
#   Gemfile.lock
2023-07-03 16:13:21 +00:00
Nicolas Florentin
b3970da1c4 displays "my orders" link only if store module is active 2023-07-03 16:31:45 +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
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
Guilherme Chaguri
855df4b552 Fix merge conflicts with dev 2023-03-15 16:26:45 -03:00
Sylvain
dad3babbe4 (ui) add alert on leaving plan form with unsaved changes 2023-03-13 14:19:48 +01:00
vincent
9294bc4c88 (ui) Plan form layout 2023-03-13 14:18:46 +01:00
Sylvain
92d3cbcd3e (bug) invalid style in accounting codes settings 2023-03-06 13:13:22 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Sylvain
892ffbe138 (quality) rename proof-of-identity to supporting-document 2023-02-15 10:30:13 +01:00
Karen
35f2a69048 (feat) Add unsaved form alert and refreshed tabs on admin machines and trainings view 2023-02-15 10:30:09 +01:00
Karen
7a83a38c68 (quality) replace Angular-controlled notifications list with react code 2023-02-15 10:30:08 +01:00
Karen
10de4fcf5e (bug) fix display of banners and add unsaved form alert on events banner 2023-02-15 10:30:06 +01:00
Sylvain
42e89ea1b0 (quality) do not load not shown components 2023-02-15 10:30:02 +01:00
Karen
116475780f (ui) delete banner insight in admin view for machines and trainings 2023-02-15 10:29:58 +01:00
Karen
0f6f763814 (feat) add custom banner on events 2023-02-15 10:29:58 +01:00
Vincent
c194ac9b31 (ui) Update machines and spaces lists layout 2023-02-15 10:29:57 +01:00
Sylvain
a77bf46bcd (ui) hide work in progress 2023-02-15 10:29:56 +01:00
Sylvain
fea26285d6 (feat) improved calendars loading time
+ (feat) ability to choose a machine in the public calendar
2023-02-15 10:29:55 +01:00
Sylvain
986a663c40 (feat) places cache for slots 2023-02-15 10:29:54 +01:00
Sylvain
bbaac2c122 (wip) use cartitem from order api 2023-02-15 10:29:51 +01:00
Sylvain
42d830b4f8 (feat) save cart items in db 2023-02-15 10:29:46 +01:00
Vincent
994b919b58 (ui) Fix layout width 2023-02-15 10:28:18 +01:00
Sylvain
2b42858229 (feat) display special style if a training override general settings 2023-02-15 10:28:16 +01:00
Karen
0778616345 (feat) add a custom banner for trainings 2023-02-15 10:28:13 +01:00
Karen
a1eaa2eae7 (feat) machines custom banner frontend and frontend test 2023-02-15 10:28:09 +01:00
vincent
7208cd80b0 (quality) Refacto pack-form 2023-02-15 10:28:06 +01:00
Sylvain
305b5425bc (ui) display trainings in list 2023-02-15 10:28:03 +01:00
vincent
2ea6f49e35 (ui) Editorial block rwd 2023-02-15 10:28:02 +01:00