1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-13 23:48:55 +01:00
Commit Graph

7949 Commits

Author SHA1 Message Date
Du Peng
6cb6974a93 (feat) hide gender in signup form if not required 2024-04-08 10:40:06 +02:00
Du Peng
b05b295bda Merge branch 'dev' for release 6.3.17 2024-04-08 09:36:38 +02:00
Du Peng
930670312d Version 6.3.17 2024-04-08 09:36:33 +02:00
Du Peng
b4c535149e (fix) remove unused table in structure.sal 2024-04-08 09:26:17 +02:00
Du Peng
61dfa141cc (bug) unable to show machine/training picture 2024-03-29 18:28:42 +01:00
Du Peng
407c0173ab (feat) add sp certificate for saml provider 2024-03-27 14:41:30 +01:00
Du Peng
584f3bc4a8 update translations 2024-03-21 18:56:24 +01:00
Du Peng
e8b59bbdcd (feat) allow admin configure memeber's profile gender/birthday as required 2024-03-21 18:21:11 +01:00
Du Peng
6db25324d2 (bug) unable to get invoice payment details if the account code is same for card/transfer payment method 2024-03-20 14:59:02 +01:00
Du Peng
0b08510473 (bug) unable to update a space with a deleted machine 2024-03-18 18:36:10 +01:00
Du Peng
1b6f43361c update changelog 2024-03-12 18:58:46 +01:00
Du Peng
8a2a9085be (impv) add loader for create/delete availability slot 2024-03-12 18:58:27 +01:00
Du Peng
91a1dc12e2 Merge branch 'dev' for release 6.3.16 2024-03-11 12:48:25 +01:00
Du Peng
d5d3e61538 Version 6.3.16 2024-03-11 12:48:20 +01:00
Du Peng
523de4f3f7 (bug) #content_type_whitelist is instead by #content_type_allowlist 2024-03-11 12:46:39 +01:00
Du Peng
f07164afb2 update changelog 2024-03-11 12:28:29 +01:00
Du Peng
cb8bea0ab8 update translations 2024-03-11 12:28:02 +01:00
Du Peng
71d10b3436 update changelog 2024-03-11 11:26:50 +01:00
Du Peng
1d179e51a9 (bug) set cash for locale payment by default 2024-03-11 11:25:25 +01:00
Du Peng
0e554d22ff (bug) set settlement by cash by default for local payment mean 2024-03-08 18:09:53 +01:00
Du Peng
59ef0dba66 Merge branch 'dev' for release 6.3.15 2024-02-29 19:34:03 +01:00
Du Peng
58e3097da2 Version 6.3.15 2024-02-29 19:33:49 +01:00
Du Peng
d4b5b3db23 (bug) unable to generate invoice for payment by check/transfer 2024-02-29 19:29:47 +01:00
Du Peng
484fbde424 Merge branch 'dev' for release 6.3.14 2024-02-26 13:50:12 +01:00
Du Peng
a2aa1f37d7 Version 6.3.14 2024-02-26 13:49:30 +01:00
dependabot[bot]
91f5ece5ae
Bump nokogiri from 1.14.3 to 1.16.2 (#472)
* Bump nokogiri from 1.14.3 to 1.16.2

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.3 to 1.16.2.
- [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.14.3...v1.16.2)

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

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nicolas Florentin <nicolas@sleede.com>
Co-authored-by: Du Peng <gnepud@gmail.com>
Co-authored-by: Vincent <vincent@sleede.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-26 13:32:03 +01:00
Du Peng
76bc352d7b update carrierwave 2024-02-26 13:28:45 +01:00
dependabot[bot]
13c74ccd2e
Bump axios from 0.21.2 to 0.28.0 (#468)
* Bump axios from 0.21.2 to 0.28.0

Bumps [axios](https://github.com/axios/axios) from 0.21.2 to 0.28.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v0.28.0/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.2...v0.28.0)

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

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nicolas Florentin <nicolas@sleede.com>
Co-authored-by: Du Peng <gnepud@gmail.com>
Co-authored-by: Vincent <vincent@sleede.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-23 16:45:42 +01:00
dependabot[bot]
e54fd0503e
Bump puma from 6.1.0 to 6.4.2 (#470)
* Bump puma from 6.1.0 to 6.4.2

Bumps [puma](https://github.com/puma/puma) from 6.1.0 to 6.4.2.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.1.0...v6.4.2)

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

Signed-off-by: dependabot[bot] <support@github.com>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nicolas Florentin <nicolas@sleede.com>
Co-authored-by: Du Peng <gnepud@gmail.com>
Co-authored-by: Vincent <vincent@sleede.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-23 16:31:50 +01:00
Peng Du
1ba0c660c8
Revert 466 dependabot/bundler/sidekiq unique jobs 7.1.33 (#474)
* (bug) unable to show wallet payment mean for invoice

* update Gemfile

* (quality) Cleanup unused feature

* update changelog

* (feat) show invoice payment method in accounting line

* (bug) PayZen amount of subscription compute error for Coupon validity per user = forever

* (bug) unable to create Stripe coupon with duration = forever

* (i18n) updated translations

* update Changelog

* Version 6.3.7

* Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)

Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.23 to 7.1.33.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.23...v7.1.33)

---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Revert "Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)"

This reverts commit a523b564f1.

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Nicolas Florentin <nicolas@sleede.com>
Co-authored-by: Vincent <vincent@sleede.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-23 16:27:58 +01:00
dependabot[bot]
a523b564f1
Bump sidekiq-unique-jobs from 7.1.23 to 7.1.33 (#466)
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 7.1.23 to 7.1.33.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases)
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v7.1.23...v7.1.33)

---
updated-dependencies:
- dependency-name: sidekiq-unique-jobs
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-23 16:26:09 +01:00
Du Peng
f8edc5bf9e (bug) event canceled places error 2024-02-23 12:50:59 +01:00
Du Peng
51c4e020f9 (doc) add saml config doc 2024-02-20 19:19:45 +01:00
Du Peng
35fdf531e8 (i18n) update translation 2024-02-20 19:19:30 +01:00
Du Peng
5b9bdd2b46 (feat) add idp_slo_service_url 2024-02-20 16:54:34 +01:00
Du Peng
48604b360b Merge branch 'dev' for release 6.3.13 2024-02-19 14:45:42 +01:00
Du Peng
68251b88b2 Version 6.3.13 2024-02-19 14:45:34 +01:00
Du Peng
0f7b1f4b8e (i18n) update translations 2024-02-19 14:44:28 +01:00
Du Peng
8686931ef3 (feat) hide machines/themes/components filter in project list if machines module is disable or themes/components is empty 2024-02-19 14:32:41 +01:00
Du Peng
015a1d7532 (bug) Unable to sync iCalendar correctly 2024-02-19 12:55:55 +01:00
Du Peng
45bbd99340 (bug) missing payment transfer journal code in accouting line 2024-02-19 12:55:28 +01:00
Du Peng
f79c2fe0a9 (feat) add settlement by transfer/check to invoice paiement info 2024-02-15 15:29:30 +01:00
Du Peng
154aa973b6 Merge branch 'dev' for release 6.3.12 2024-02-12 11:54:00 +01:00
Du Peng
d897d05cdf Version 6.3.12 2024-02-12 11:53:52 +01:00
Du Peng
35d0d240ef (i18n) update translations 2024-02-12 11:50:33 +01:00
Du Peng
cf998e6220 (feat) add payment transfer/check to accounting settings 2024-02-12 11:39:33 +01:00
Du Peng
ff80216d9b (feat) Allow the admin to update payment method only the overdue subscription item without cancel PayZen subscription 2024-02-08 15:59:17 +01:00
Du Peng
f5d82789da Merge branch 'dev' for release 6.3.11 2024-02-02 18:58:18 +01:00
Du Peng
34e9a0cc97 Version 6.3.11 2024-02-02 18:57:53 +01:00
Du Peng
5da7f827d4 Merge branch 'dev' for release 6.3.11 2024-02-02 18:49:32 +01:00