rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-12 23:09:03 +01:00
Code Issues Releases Activity
7,782 Commits 15 Branches 274 Tags 83 MiB
26ea12340a
Commit Graph

56 Commits

Author SHA1 Message Date
Du Peng
12b1ff5f0e Merge branch 'pre_inscription' into family_compte_pre_inscription 2023-09-11 17:59:14 +02:00
Du Peng
fb2b762015 Merge branch 'spaces-machines-tree' into dev 2023-09-11 09:54:08 +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
Nicolas Florentin
043ff6d47e wip 2023-07-20 16:55:22 +02:00
Du Peng
ec1a736601 (feat) child validation 2023-07-04 15:01:06 +02:00
Du Peng
7d10132953 (feat) add Family account setting 2023-07-04 14:56:29 +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
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
2756502131 (bug) invalid duration for machine/spaces reservations in statistics, when using slots of not 1 hour 2023-05-04 14:15:14 +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
c2739f73a7 (bug) unable to select a new machine for an existing category 2023-03-13 12:11:56 +01:00
Guilherme Chaguri
1aa9b2fe39 Added reservation deadlines for each type of reservation 2023-03-01 17:44:01 -03:00
Sylvain
ee2cbc332f (bug) invalid border color for slots 2023-02-24 15:16:57 +01:00
Karen
0f6f763814 (feat) add custom banner on events 2023-02-15 10:29:58 +01:00
Sylvain
e5b199f8ed (quality) improved calendar loading time 2023-02-15 10:29:57 +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
42d830b4f8 (feat) save cart items in db 2023-02-15 10:29:46 +01:00
Karen
0778616345 (feat) add a custom banner for trainings 2023-02-15 10:28:13 +01:00
Sylvain
04f933f94d (bug) deal with DST using Time instead of DateTime 2023-02-14 13:10:58 +01:00
Sylvain
dcaa5ad28c (bug) unsupported param[] syntax in OpenAPI 2022-12-21 14:14:30 +01:00
Sylvain
a55880a0ad (feat) OpenAPI endpoint for accounting 
Also: (bug) filter by array in openAPI = error
 2022-12-21 14:12:14 +01:00
Sylvain
7b30086a34 (bug) unable to set amount to 4.85 2022-12-01 15:43:16 +01:00
Sylvain
963d2e93bd (bug) unable to export statistics 2022-12-01 13:03:19 +01:00
Sylvain
37b24a8d2f refactor slots model 2022-07-18 17:18:01 +02:00
Sylvain
5012912edd (wip) refactoring Availabilities::AvailabilitiesService and Availabilities::StatusService 2022-07-18 17:18:01 +02:00
Sylvain
6ce762f778 (bug) unable to reserve a space 2022-06-29 15:34:47 +02:00
Sylvain
39682e24e4 fix locales with webpack 2020-09-15 15:00:05 +02:00
Sylvain
fd93093f0d UI to configure the spaces module 2020-05-26 10:53:49 +02:00
Sylvain
ba4c39ca99 use slot duration from the db setting 2020-05-25 12:55:01 +02:00
Sylvain
a63340188b configure default slot duration from settings panel 2020-05-25 12:55:01 +02:00
Sylvain
0b81f957ef fix testing assets with rails 5 2020-04-01 12:51:46 +02:00
Sylvain
57e5da61de remove unused helper 2020-01-21 11:01:23 +01:00
Sylvain
cdc30e0da2 configure the slots duration with an environment variable 2019-10-29 16:52:52 +01:00
Sylvain
26b901ebb5 [bug#131] Availabilities export report an erroneous number of reservations for machine availabilities 2019-05-07 12:24:51 +02:00
Sylvain
94796bca29 fixed ruby syntax with linter 2019-04-04 09:33:41 +02:00
Sylvain
6794b12555 force gawk during elastic upgrade & rubocop 2018-12-03 15:10:04 +01:00
Sylvain
31cdc5c695 [bug] reccursive events have difference with requested time when crossing DST (#77) 2017-09-04 16:50:07 +02:00
Sylvain
112b174e5f [bug] invalid time for reccurent events after Daylight Saving Time change 2017-08-31 17:32:04 +02:00
Sylvain
38ce1b23b7 fix duplicates SLOT_DURATION declarations 2017-03-13 10:21:41 +01:00
Sylvain
504fe49964 export machines availabilities 2017-03-02 12:34:28 +01:00
Sylvain
847a0ba140 display correct slot status in space reservation calendar 2017-02-27 16:15:27 +01:00
Sylvain
8e86c4b212 [ongoing] spaces reservation calendar 2017-02-23 17:45:55 +01:00
Sylvain
d463d4dd5a display spaces in admin calendar 2017-02-15 13:18:03 +01:00
Sylvain
74154cf1f3 Merge branch 'xls' into dev 
Conflicts:
	CHANGELOG.md
	app/helpers/application_helper.rb
	config/locales/en.yml
	config/locales/fr.yml
 2016-07-25 16:56:22 +02:00
Peng DU
db8a6e8a32 application can show user wallet 2016-07-21 16:32:53 +02:00