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

4842 Commits

Author SHA1 Message Date
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
dependabot[bot]
4baa83f6b8
Bump immer from 9.0.3 to 9.0.6
Bumps [immer](https://github.com/immerjs/immer) from 9.0.3 to 9.0.6.
- [Release notes](https://github.com/immerjs/immer/releases)
- [Commits](https://github.com/immerjs/immer/compare/v9.0.3...v9.0.6)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-03 06:43:31 +00:00
dependabot[bot]
8e26e24f29
Bump tar from 6.1.4 to 6.1.11
Bumps [tar](https://github.com/npm/node-tar) from 6.1.4 to 6.1.11.
- [Release notes](https://github.com/npm/node-tar/releases)
- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-tar/compare/v6.1.4...v6.1.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-31 20:53:22 +00:00
Du Peng
a910e8999b fix bug: editor xss vulerability, disable code view in new/edit project 2021-08-31 11:30:23 +02:00
Du Peng
454f32579b Merge branch 'dev' for release 5.1.7 2021-08-24 11:04:22 +02:00
Du Peng
358248cf96 Version 5.1.7 2021-08-24 11:04:22 +02:00
Du Peng
a2a32ef3c6 fix bug: error in plans list page 2021-08-24 11:01:21 +02:00
Sylvain
810d46e40d New translations app.public.en.yml (Norwegian) 2021-08-24 10:57:20 +02:00
Sylvain
9543962538 New translations app.admin.en.yml (Norwegian) 2021-08-24 10:57:20 +02:00
Du Peng
7f9a972da6 Merge branch 'dev' for release 5.1.6 2021-08-06 12:01:19 +02:00
Du Peng
18d36ee59d Version 5.1.6 2021-08-06 12:01:19 +02:00
Sylvain
59755f75b3 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
95bab5ed26 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
e87f550336 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
6d88cd38e3 New translations app.logged.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
851289b970 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
0b383bbcbd New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
312226bfa3 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
5f05fa09db New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
a5a8cb51d8 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8f50abf15a New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
d61cc3b369 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
68274801d7 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8afd04c0c3 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c69791eae9 New translations app.admin.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
c006c24579 New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00
Sylvain
8d3b99caee New translations app.public.en.yml (Norwegian) 2021-08-06 11:17:32 +02:00