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

5526 Commits

Author SHA1 Message Date
Sylvain
4b2ff659ca (style) eslint all code 2022-05-04 11:34:55 +02:00
Sylvain
320519f91b (dev) webpack overlay report eslint issues
Also: updated eslint
2022-05-04 11:33:48 +02:00
vincent
4a995b3bd8 merge 2022-05-04 11:30:42 +02:00
vincent
1868be1642 Add labels 2022-05-04 11:20:19 +02:00
vincent
67f678a282 Add image embed in the text editor 2022-05-04 11:20:19 +02:00
vincent
cd5c253b3e Add video embed on the text editor 2022-05-04 11:20:17 +02:00
vincent
7ebdc1b06e Test video embed on the text editor 2022-05-04 11:18:28 +02:00
vincent
3611abe853 Delete unused components 2022-05-04 11:18:28 +02:00
vincent
e6c6f35ff9 Update Node 2022-05-04 11:18:26 +02:00
vincent
c1ec8b5ce8 Add style variables 2022-05-04 11:16:57 +02:00
vincent
3f4714861b Add description to plan category 2022-05-04 11:16:51 +02:00
Sylvain
9cc3f1480b (security) updated rails to 5.2.7.1 2022-05-04 11:05:37 +02:00
Sylvain
8f4c254d75 (security) updated ruby to 2.6.10 2022-05-04 10:37:58 +02:00
Nicolas Florentin
5e5822c89f Fix a bug: edge case of birthday in the future in seeds.rb, we should use Date.current instead of DateTime.current since birthday is a date (see https://github.com/sleede/fab-manager/issues/344) 2022-05-04 08:50:10 +02:00
Nicolas Florentin
5cffdff65a when generating an avoir, the option "by_wallet" is not present anymore if wallet module is off 2022-05-02 14:16:55 +02:00
Nicolas Florentin
8853c2e076 rm reference to clickup 2022-05-02 10:57:22 +02:00
Du Peng
16e3d70395 Version 5.3.13 2022-05-02 10:54:26 +02:00
Du Peng
7bc7e58e22 Merge branch 'master' of github.com:sleede/fab-manager into dev 2022-05-02 10:52:35 +02:00
Nicolas Florentin
2389daadc0 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2022-05-02 09:47:14 +02:00
Nicolas Florentin
b6e586bada fix name of rake task for payzen 2022-05-02 09:47:04 +02:00
Nicolas Florentin
90e796c721 updates name of rake task 2022-05-02 09:21:35 +02:00
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
95b6502554 Merge branch 'dev' for release 5.3.12 2022-04-20 18:48:50 +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