rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity
5,209 Commits 15 Branches 273 Tags 82 MiB
5f5af95634
Commit Graph

5209 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvain
b31f9df37f New translations app.admin.en.yml (French) 2021-12-23 10:25:58 +01:00
Sylvain
46c42303ee New translations en.yml (French) 2021-12-23 10:25:56 +01:00
Du Peng
46259fce8e Merge branch 'dev' for release 5.2.0 2021-12-23 10:15:58 +01:00
Du Peng
430796ef3e Merge branch 'master' of github.com:sleede/fab-manager into dev 2021-12-23 10:11:34 +01:00
Du Peng
2153973c46 update package.json version 2021-12-23 10:11:23 +01:00
Du Peng
dc1a1cbe4c bump to v5.2.0 2021-12-23 09:57:01 +01:00
Du Peng
70b06fbaf9 Merge remote-tracking branch 'origin/spaces_multiprices' into dev 2021-12-23 09:37:10 +01:00
Du Peng
2ec8a63af9 Merge remote-tracking branch 'origin/spaces_multiprices' into dev 2021-12-23 09:34:55 +01:00
Sylvain
dc242fc7be Default false for extended_prices_in_same_day 2021-12-23 08:34:25 +00:00
vincent
c394b3a275 Fix classes names 2021-12-22 17:25:02 +01:00
Vincent
934ac309a1 Merge branch 'dev' into 'spaces_multiprices' 
# Conflicts:
#   CHANGELOG.md
 2021-12-22 14:29:56 +00:00
Sylvain
b864ba66da Apply 22 suggestion(s) to 6 file(s) 2021-12-22 14:07:48 +00:00
Sylvain
5be06babd7 Apply 1 suggestion(s) to 1 file(s) 2021-12-22 13:51:26 +00:00
vincent
fc83b4d9c3 Create [pricing] sub folders 2021-12-21 20:13:55 +01:00
vincent
1068939999 Update CHANGELOG 2021-12-21 18:19:13 +01:00
vincent
0d34bffa6d Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 18:06:25 +01:00
vincent
1d38d6ae50 fix + new icon 2021-12-21 18:02:39 +01:00
Sylvain
1c9b07ec38 updated changelog 2021-12-21 17:28:57 +01:00
Sylvain
61f432914c optimize payment schedules list loading 2021-12-21 17:27:51 +01:00
vincent
c3cbc26a1e Merge branch 'spaces_multiprices_front' into spaces_multiprices 2021-12-21 17:14:22 +01:00
vincent
bd781a14e9 Add extended price 2021-12-21 17:13:40 +01:00
Sylvain
ffb0f3e19e ability to limit extended prices to slots in the same day 2021-12-21 16:32:02 +01:00
Sylvain
2d807e6c94 improved slot price calculation 2021-12-21 15:30:08 +01:00
vincent
af4acc895c Merge branch 'spaces_multiprices' into spaces_multiprices_front 2021-12-21 15:24:20 +01:00
vincent
d6a4675209 wip 2021-12-21 14:37:38 +01:00
Sylvain
6091cec82e api endpoint to create prices 2021-12-21 14:18:03 +01:00
Sylvain
9173bdbcb4 [bug] fix duplicates email on case sensitive matches 2021-12-21 11:20:44 +01:00
Sylvain
2b834045ef improve price calculation 2021-12-21 11:14:09 +01:00
Sylvain
90b1e98938 fix unable to link address from sso 2021-12-21 10:42:59 +01:00
Sylvain
6dc2e8e41e modelise space object from API in TS 2021-12-21 09:51:40 +01:00
vincent
f8798e28b5 Convert [spaces] to React 2021-12-20 19:12:01 +01:00
Sylvain
4a8fa65e5f workaround pending for UI 2021-12-20 17:19:43 +01:00
Sylvain
d6b30875a4 compute the price based on custom durations 2021-12-20 17:08:14 +01:00
Sylvain
5ebc1017d2 save prices duration in db 2021-12-20 15:47:57 +01:00
Sylvain
94c4be3e61 remove useless code 2021-12-20 15:25:49 +01:00
Sylvain
93b2355284 updated changelog 2021-12-20 14:28:59 +01:00
Sylvain
a655f31242 updated changelog 2021-12-20 14:20:57 +01:00
Sylvain
c91e825496 [bug] minamed sso perperty 2021-12-20 14:10:44 +01:00
Sylvain
3fb9850786 [bug] unable to bind sso to Profile.bithday or Profile.gender 2021-12-20 14:07:25 +01:00
Sylvain
587beb01ab fix user import from sso 
A bug was introduced by detailed debug logs
 2021-12-20 13:41:40 +01:00
Sylvain
3a787ea2a0 support for JSONPath syntax in oAuth2 mapping 2021-12-20 13:40:55 +01:00
Sylvain
871fab682a Merge branch 'dev' of github.com:sleede/fab-manager into dev 2021-12-06 08:51:19 +01:00
Sylvain
5f95a1d0fa
Merge pull request #312 from sleede/l10n_dev 
New Crowdin updates
 2021-12-06 08:50:18 +01:00
Sylvain
6ed130f042 New translations mails.en.yml (Portuguese) 2021-12-04 21:57:29 +01:00
Sylvain
1eb24b9f46 New translations mails.en.yml (Portuguese) 2021-12-04 21:47:12 +01:00
Sylvain
381edce6d6 New translations en.yml (Portuguese) 2021-12-04 21:47:11 +01:00
Sylvain
252d1ae3a0 New translations en.yml (Portuguese) 2021-12-04 21:37:53 +01:00
Sylvain
1b2e4ee3ad New translations en.yml (Portuguese) 2021-12-04 21:28:40 +01:00
Sylvain
e3c56dd3bb New translations en.yml (Portuguese) 2021-12-04 21:18:39 +01:00
Sylvain
032aaeedc8 New translations en.yml (Portuguese) 2021-12-04 21:08:23 +01:00