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

4918 Commits

Author SHA1 Message Date
Sylvain
a4fea0c331 New translations app.admin.en.yml (Spanish) 2021-10-04 11:03:04 +02:00
Sylvain
04703615bb New translations app.admin.en.yml (French) 2021-10-04 11:03:03 +02:00
Sylvain
7dcda178c0 [bug] updated sassc to 2.4.0 (#270) 2021-10-04 10:57:17 +02:00
Sylvain
b9d5e09a58 updated changelog 2021-10-04 09:50:28 +02:00
Sylvain
a8e7b3faae updated changelog 2021-10-04 09:48:58 +02:00
Sylvain
3769afe431 Merge branch 'editor_xss_vulnerability' into dev 2021-10-04 09:31:34 +02:00
Sylvain
6276944a5a New translations app.logged.en.yml (French) 2021-09-30 11:22:21 +02:00
Sylvain
03f11bab4e New translations app.shared.en.yml (French) 2021-09-30 11:22:16 +02:00
Sylvain
1f89fb6a3e New translations app.admin.en.yml (French) 2021-09-30 11:22:05 +02:00
Sylvain
94634ed825 remove unused tr key 2021-09-30 11:04:00 +02:00
dependabot[bot]
a024d57c2b
Bump nokogiri from 1.11.4 to 1.12.5
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.4...v1.12.5)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 20:41:52 +00:00
Ismaël Sebbane
2c0b981c90 [machines-edit-view] Replaced a href link by button because more semantically correct + it actually redirects to the homepage (unwanted behaviour) 2021-09-22 19:01:10 +02:00
Ismaël Sebbane
6f6096b59e Updated changelog 2021-09-22 15:31:26 +02:00
Du Peng
132ccebde7 fix syntax error for theme style 2021-09-22 13:27:12 +02:00
Ismaël Sebbane
caa66f26ab Chained selectors .profile-top and about-picture to share the background image using the profile image file option 2021-09-22 13:23:12 +02:00
Sylvain
115bdb2776 New translations app.logged.en.yml (Zulu) 2021-09-21 18:26:38 +02:00
Sylvain
b03b01784d New translations app.admin.en.yml (Zulu) 2021-09-21 18:26:37 +02:00
Sylvain
deab5cd42d New translations app.logged.en.yml (Portuguese) 2021-09-21 18:26:35 +02:00
Sylvain
1f5e1dea43 New translations app.admin.en.yml (Portuguese) 2021-09-21 18:26:34 +02:00
Sylvain
2affcb04ad New translations app.logged.en.yml (Norwegian) 2021-09-21 18:26:33 +02:00
Sylvain
f9bf77aabc New translations app.admin.en.yml (Norwegian) 2021-09-21 18:26:32 +02:00
Sylvain
734293891d New translations app.logged.en.yml (German) 2021-09-21 18:26:31 +02:00
Sylvain
ce7c40ea70 New translations app.admin.en.yml (German) 2021-09-21 18:26:30 +02:00
Sylvain
ebea4969bf New translations app.logged.en.yml (Spanish) 2021-09-21 18:26:28 +02:00
Sylvain
c636103a4d New translations app.admin.en.yml (Spanish) 2021-09-21 18:26:27 +02:00
Sylvain
4395032156 New translations app.logged.en.yml (French) 2021-09-21 18:26:26 +02:00
Sylvain
6cf94576d8 New translations app.admin.en.yml (French) 2021-09-21 18:26:25 +02:00
Du Peng
d107dd543a Merge branch 'dev' for release 5.1.9 2021-09-21 18:13:02 +02:00
Du Peng
5a1f7497ef Version 5.1.9 2021-09-21 18:13:02 +02:00
Du Peng
235fd2e58a Merge branch 'buy_pack_for_plan_option' into dev 2021-09-21 18:01:54 +02:00
Du Peng
2c78ab9cee fix bug: book overlapping slot setting labal error 2021-09-21 18:01:47 +02:00
Du Peng
1c54e54c17 use plant.base_name instands of plan.name 2021-09-21 18:00:48 +02:00
Du Peng
f2dd1bbcd2 add an option Subscription valid for purchase and use of a prepaid pack 2021-09-20 19:43:05 +02:00
Sylvain
49a8905b44 New translations app.shared.en.yml (Zulu) 2021-09-13 16:40:33 +02:00
Sylvain
98c65da1b4 New translations app.shared.en.yml (French) 2021-09-13 16:40:29 +02:00
dependabot[bot]
a1e024df15
Bump axios from 0.21.1 to 0.21.2
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 14:34:23 +00:00
dependabot[bot]
cc4cf446a1
Bump url-parse from 1.5.1 to 1.5.3
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-13 14:34:19 +00:00
Du Peng
a159abe04e Merge branch 'dev' for release 5.1.8 2021-09-13 16:33:32 +02:00
Du Peng
a9901fccb2 Version 5.1.8 2021-09-13 16:33:32 +02:00
Du Peng
5d8a1367a6 update test 2021-09-13 14:25:30 +02:00
Du Peng
f4ed3ca391 fix bug: admin takes a subscription with a payment schedule by stipe 2021-09-10 18:32:39 +02:00
Du Peng
65ba3a686b disable monthly payment for 1 month of subscription 2021-09-10 15:34:49 +02:00
Du Peng
6b763cc1c9 improve code for stripe subscription payment 2021-09-10 15:19:04 +02:00
Du Peng
745e2ae6cf fix stripe subuscription cancal date 2021-09-10 12:24:42 +02:00
Du Peng
c9f20ddc03 fix bug: plans page show an error if admin dont create any plans 2021-09-09 18:46:23 +02:00
Du Peng
334d8ce055 check event event_theme_ids if exist 2021-09-09 18:25:26 +02:00
Du Peng
2f7325fee4 fix bug: statistics dont show in nav menu after login 2021-09-09 17:36:04 +02:00
Du Peng
4e02122c30 Merge branch 'stripe_payment_schedule' into dev 2021-09-09 10:30:12 +02:00
Du Peng
238d7af1ee disable monthly payment if interval count == 1 2021-09-08 19:21:44 +02:00
Du Peng
2973dec6a7 rewrite payment schedule workflow by stripe 2021-09-08 18:57:10 +02:00