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

5504 Commits

Author SHA1 Message Date
Nicolas Florentin
dc1b747341 adds rake task fablab:payzem:replay_on_payment_success to replay PayzenController#on_payment_success for a given a event 2022-04-29 08:34:13 +02:00
Nicolas Florentin
4b30d9f124 Fix a bug: With PayZen, when there was more than one transaction (for ex: 1 failed atempt + 1 successful atemp), the order was not considered PAID because only the first transaction was checked (https://app.clickup.com/t/28zvhwy) 2022-04-28 13:36:16 +02:00
Du Peng
6996cd5e0a Version 5.3.12 2022-04-20 18:48:49 +02:00
Du Peng
dd5090826a Add fablab:openlab:bulk_update rake task 2022-04-20 18:30:46 +02:00
Du Peng
b1e8b64ecc Auto sync projects to OpenLab if set openlab_app_id and openlab_app_secret 2022-04-20 17:43:38 +02:00
Du Peng
aa82342b1a Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2022-04-20 16:43:18 +02:00
Du Peng
6f67a5eaff Fix a bug: back bouton can't return to previously page in projects page (list/new/show/edit) 2022-04-20 16:43:16 +02:00
Nicolas Florentin
9344f499ef updates changelog with instructions about synchro of projects with Openlab Projects, to fix potential corrupted projects 2022-04-20 15:30:23 +02:00
Du Peng
432bcdd521 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2022-04-19 18:28:43 +02:00
Du Peng
ff230b5451 Fix a bug: unable to switch OpenLab projets 2022-04-19 18:28:31 +02:00
Sylvain
78c8cccf55 (security) Merge pull request #342 from sleede/dependabot/npm_and_yarn/async-2.6.4
Bump async from 2.6.3 to 2.6.4
2022-04-19 10:17:08 +02:00
dependabot[bot]
72883ccf46
Bump async from 2.6.3 to 2.6.4
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-15 11:46:29 +00:00
Du Peng
f0ba7bf35c Merge branch 'dev' for release 5.3.11 2022-04-15 13:45:48 +02:00
Du Peng
516018254c Version 5.3.11 2022-04-15 13:45:47 +02:00
Du Peng
2a71b3e78d Fix a bug: unable to show projets whom user take part in 2022-04-15 13:20:50 +02:00
Du Peng
e93a306f58 Fix a bug: miss smtp tls in secrets.yml 2022-04-15 12:24:55 +02:00
Du Peng
a703c00279 Fix a bug: unable to switch OpenLab projets 2022-04-15 12:21:08 +02:00
Du Peng
1e5e18481d Fix a bug: unable to send notification mail if no set a logo 2022-04-15 12:20:17 +02:00
Sylvain
163e669424
Merge pull request #341 from sleede/l10n_dev
New Crowdin updates
2022-04-13 10:53:07 +02:00
Sylvain
a7318ae7aa New translations app.shared.en.yml (French) 2022-04-13 10:51:56 +02:00
Sylvain
9468cefa26 New translations app.admin.en.yml (French) 2022-04-13 10:51:54 +02:00
Sylvain
1fa204f599 New translations en.yml (French) 2022-04-13 10:51:34 +02:00
Sylvain
8413e682ee (security) Merge pull request #340 from sleede/dependabot/bundler/nokogiri-1.13.4
Bump nokogiri from 1.13.3 to 1.13.4
2022-04-13 10:46:33 +02:00
Sylvain
bf97001cb4 (security) Merge pull request #339 from sleede/dependabot/npm_and_yarn/moment-2.29.2
Bump moment from 2.29.1 to 2.29.2
2022-04-13 10:42:50 +02:00
Sylvain
01395dd74c (security) Merge pull request #338 from sleede/dependabot/bundler/puma-4.3.12
Bump puma from 4.3.11 to 4.3.12
2022-04-13 10:40:25 +02:00
Sylvain
28c269540b New translations app.shared.en.yml (Zulu) 2022-04-12 17:51:18 +02:00
Sylvain
209f81a5c6 New translations app.shared.en.yml (French) 2022-04-12 17:51:16 +02:00
Sylvain
1e31d9a296 New translations app.shared.en.yml (German) 2022-04-12 17:51:11 +02:00
Sylvain
5fcf6276d8 New translations app.admin.en.yml (French) 2022-04-12 17:51:09 +02:00
Sylvain
b564fed5c4 New translations en.yml (Zulu) 2022-04-12 17:51:04 +02:00
Sylvain
2cac08359d New translations app.admin.en.yml (Zulu) 2022-04-12 17:51:03 +02:00
Sylvain
46af67c8a0 New translations en.yml (French) 2022-04-12 17:50:59 +02:00
Du Peng
b503c9fb34 Merge branch 'dev' for release 5.3.10 2022-04-12 17:45:33 +02:00
Du Peng
63a25e4cf4 Version 5.3.10 2022-04-12 17:45:33 +02:00
Du Peng
b277022f6f Set invoice reference is required 2022-04-12 17:17:39 +02:00
dependabot[bot]
b7b331def2
Bump nokogiri from 1.13.3 to 1.13.4
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-12 10:28:02 +00:00
Du Peng
9b0c5948cf Updated generate invoice reference method 2022-04-11 19:01:08 +02:00
dependabot[bot]
dd7db8cf12
Bump moment from 2.29.1 to 2.29.2
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-09 02:02:14 +00:00
Du Peng
18c17cc93c Fix a bug: form maxlength count to exclude spaces and newline 2022-04-07 15:22:54 +02:00
Nicolas Florentin
16accfca44 [bugfix] race condition on invoice after payment (concerning payment schedules) https://app.clickup.com/t/25zpmn1 2022-04-06 16:44:31 +02:00
Du Peng
60e9ccd7ce Fix a bug: unable to show deleted user in reservation slot 2022-04-05 16:44:55 +02:00
Du Peng
8f3f2ba083 Fix a bug: unable to confirm modification of reservation for client 2022-04-05 16:43:43 +02:00
Du Peng
08b072e33c Fix a bug: unable to show machine availability slot for admin 2022-04-05 14:21:19 +02:00
Du Peng
e66a6adece Merge branch 'dev' for release 5.3.9 2022-04-01 16:40:20 +02:00
Du Peng
f24002e323 Version 5.3.9 2022-04-01 16:40:19 +02:00
Du Peng
afff401952 update changelog 2022-04-01 16:32:43 +02:00
Du Peng
a6c230145b Optimise sql query, avoid to N+1 2022-04-01 16:31:46 +02:00
Du Peng
97f7a0aac8 Fix bug: unable to show payment modal for stripe 2022-04-01 16:16:32 +02:00
dependabot[bot]
94443d07a8
Bump puma from 4.3.11 to 4.3.12
Bumps [puma](https://github.com/puma/puma) from 4.3.11 to 4.3.12.
- [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/v4.3.11...v4.3.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-31 01:59:03 +00:00
Sylvain
3fa3e58d8e Updated CHANGELOG to reflect ruby 2.6.8 changes 2022-03-30 10:19:37 +00:00