1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Commit Graph

7184 Commits

Author SHA1 Message Date
Sylvain
bec610458c (bug) do not create plans for disabled groups
Also: (bug) unable to create plan without partner
(bug) unable to set plan price to a decimal number
(bug) unable to create a plan without toggling the partner switch
(quality) linted PlansService
2022-12-21 14:05:16 +01:00
Sylvain
be8ae01ba4 (ui) refactor plan form
Also: add advanced accounting to plans
2022-12-21 14:05:16 +01:00
Sylvain
85fcc71d6b (wip) refactor plan form 2022-12-21 14:05:15 +01:00
Sylvain
4a9cbbb227 (feat) advanced accounting for products 2022-12-21 14:05:15 +01:00
Sylvain
7868f31a58 (feat) advanced accounting parameters
for: machines, spaces, trainings, events
2022-12-21 14:05:15 +01:00
Sylvain
3d796549f2 (ui) refactor event form 2022-12-21 14:05:14 +01:00
Sylvain
8df60a8712 (ui) refactor space form 2022-12-21 14:05:14 +01:00
Sylvain
3d88266fe6 (ui) refactor training form 2022-12-21 14:05:13 +01:00
Sylvain
4203da097c (ui) refactor machine creation form 2022-12-21 14:05:13 +01:00
Sylvain
4cc6574f58 (ui) refactor machine edition form 2022-12-21 14:05:09 +01:00
Sylvain
e540316a36 (doc) updated changelog 2022-12-21 12:21:46 +01:00
Sylvain
c7b270c822
(bug) Fix tests in UTC negative timezones
Fix tests in UTC negative timezones
2022-12-21 12:19:44 +01:00
Du Peng
bcd76ee6d5 (bug) always show machine availability in calender if machine module is inactive 2022-12-20 18:46:25 +01:00
Du Peng
f47440c85a (feat) add machine category 2022-12-20 18:45:53 +01:00
Guilherme Chaguri
16c76126a5 Merge branch 'dev' into fix/tests-timezone 2022-12-20 13:58:05 -03:00
Guilherme Chaguri
0544bec729 Fix test fixtures to use the current timezone 2022-12-20 13:57:37 -03:00
Sylvain
6752cefb5e
Merge pull request #424 from sleede/l10n_dev
New Crowdin updates
2022-12-19 13:40:55 +01:00
Sylvain
d80627a178 New translations app.admin.en.yml (French) 2022-12-19 11:26:47 +01:00
Sylvain
66ff3b0dc3 New translations en.yml (French) 2022-12-19 11:26:46 +01:00
Sylvain
8d81f80c16 New translations app.admin.en.yml (Zulu) 2022-12-19 10:25:41 +01:00
Sylvain
dcf2d48f2a New translations en.yml (Zulu) 2022-12-19 10:25:40 +01:00
Sylvain
9542130d45 New translations app.admin.en.yml (Portuguese) 2022-12-19 10:25:39 +01:00
Sylvain
966a956bb1 New translations en.yml (Portuguese) 2022-12-19 10:25:37 +01:00
Sylvain
8a815ff4d2 New translations app.admin.en.yml (Norwegian) 2022-12-19 10:25:36 +01:00
Sylvain
e1374b7a8d New translations en.yml (Norwegian) 2022-12-19 10:25:35 +01:00
Sylvain
5718cfe6b3 New translations app.admin.en.yml (German) 2022-12-19 10:25:34 +01:00
Sylvain
fe9900d79f New translations en.yml (German) 2022-12-19 10:25:33 +01:00
Sylvain
7e77c00e37 New translations app.admin.en.yml (Spanish) 2022-12-19 10:25:32 +01:00
Sylvain
a5a7eafa46 New translations en.yml (Spanish) 2022-12-19 10:25:31 +01:00
Sylvain
8b12bec379 New translations app.admin.en.yml (French) 2022-12-19 10:25:30 +01:00
Sylvain
6e6e99b090 New translations en.yml (French) 2022-12-19 10:25:28 +01:00
Sylvain
9f5b259f32 (doc) updated changelog 2022-12-19 10:22:11 +01:00
Sylvain
639c460eb7 Merge branch 'Guichaguri-feature/reservation-deadlines' into dev 2022-12-19 10:21:10 +01:00
Sylvain
795928c07c (feat) Add reservation deadline parameter 2022-12-19 09:58:44 +01:00
Du Peng
fb6f3b49f3 Merge branch 'dev' for release 5.5.8 2022-12-16 18:50:21 +01:00
Du Peng
032a05713b Version 5.5.8 2022-12-16 18:50:20 +01:00
Sylvain
87c6f4c36f (security) CVE-2022-23517, CVE-2022-23518, CVE-2022-23519, CVE-2022-23520, CVE-2022-32209
Bump rails-html-sanitizer from 1.4.3 to 1.4.4
2022-12-16 15:56:46 +01:00
Sylvain
66b1db6d0a (bug) phone/adresse required not shown 2022-12-16 15:35:02 +01:00
Sylvain
44089f9cf6 (dev) upgrade to CodeQL Action v2 2022-12-16 14:53:15 +01:00
Sylvain
cd37d40fdc (dev) fix brakeman setup
+ improved overcommit checking
2022-12-16 14:50:11 +01:00
Guilherme Chaguri
9b2e1909d9 Allow last minute reservations by admins 2022-12-16 10:48:56 -03:00
dependabot[bot]
3d1ac107f0
Bump rails-html-sanitizer from 1.4.3 to 1.4.4
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-14 14:38:23 +00:00
Sylvain
fd0dc57503 (quality) removed rails_12factor 2022-12-14 14:36:30 +01:00
Sylvain
28a78b2acd
Merge pull request #416 from sleede/l10n_dev
New Crowdin updates
2022-12-14 14:09:00 +01:00
Sylvain
982f7518d3 (security) CVE-2022-23514, CVE-2022-23515, CVE-2022-23516
Bump loofah from 2.18.0 to 2.19.1
2022-12-14 13:50:23 +01:00
Sylvain
80bc709580 (security) CVE-2021-4243
Bump @claviska/jquery-minicolors from 2.3.5 to 2.3.6
2022-12-14 13:42:23 +01:00
Sylvain
5604c9ab28 (security) CVE-2022-24999
Bump express from 4.17.1 to 4.18.2
2022-12-14 13:39:47 +01:00
Sylvain
2cc1988e8d (bug) space reservations count in availabilities export (#415) 2022-12-14 13:34:39 +01:00
Sylvain
4f03f70199 (doc) updated changelog 2022-12-14 13:33:26 +01:00
Sylvain
380373a16d Merge branch 'fix/availabitilies_export_reservations' of https://github.com/Guichaguri/fab-manager into Guichaguri-fix/availabitilies_export_reservations 2022-12-14 12:30:11 +01:00