431 Commits

Author	SHA1	Message	Date
Du Peng	fb2b762015	Merge branch 'spaces-machines-tree' into dev	2023-09-11 09:54:08 +02:00
Du Peng	a10f3cffe4	(feat) statistics improvements	2023-09-01 12:43:36 +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
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
Du Peng	af57e59ccd	(bug) event canceled places error	2023-07-26 16:10:05 +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
Vincent	a4d6723413	(ui) Fix machines padding	2023-07-20 09:35:58 +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
vincent	9ac9a2a725	(ui) Update product categories layout	2023-02-15 10:28:01 +01:00
vincent	18f0cf3f0f	(ui) Fix edit event form layout	2023-02-15 10:28:00 +01:00
vincent	49a06a9176	(ui) Update machines layout	2023-02-15 10:27:59 +01:00
vincent	5fd2d3fc79	(ui) Add missing margin	2023-02-15 10:27:59 +01:00