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

7551 Commits

Author SHA1 Message Date
Du Peng
5365cbdaba (wip) add/edit user children 2023-07-04 14:56:33 +02:00
Du Peng
7d10132953 (feat) add Family account setting 2023-07-04 14:56:29 +02:00
Du Peng
734608f31c Version 6.0.8 2023-07-03 18:40:29 +02:00
Du Peng
212e044a6b (i18n) updated translations 2023-07-03 18:39:02 +02:00
Du Peng
878051d2b1 (doc) update changelogs 2023-07-03 18:18:00 +02:00
Du Peng
875dc4a3bd Merge branch 'projects-improvements' into dev 2023-07-03 18:15:19 +02:00
Peng
bc320693cf Merge branch 'dev' into 'projects-improvements'
# Conflicts:
#   Gemfile.lock
2023-07-03 16:13:21 +00:00
Du Peng
d4313a1efc (doc) update changelog 2023-07-03 17:45:59 +02:00
Peng
6ed79fe215 Merge branch 'navbar-my-orders-link' into 'dev'
displays "my orders" link only if store module is active

See merge request projets/fab-manager!11
2023-07-03 15:44:58 +00:00
Du Peng
e50c90b30d (bug) Accouning Line in duplicate 2023-07-03 17:43:27 +02:00
Nicolas Florentin
b3970da1c4 displays "my orders" link only if store module is active 2023-07-03 16:31:45 +02:00
Nicolas Florentin
b8fd8d8172 Merge remote-tracking branch 'origin/projects-to-markdown' into projects-improvements 2023-07-03 14:37:57 +02:00
Nicolas Florentin
a3a5527141 Merge branch 'project-categories' into projects-improvements 2023-07-03 14:32:35 +02:00
Nicolas Florentin
bc284e7813 filter projects by date 2023-07-03 11:42:29 +02:00
Nicolas Florentin
94b0b062bc fix 2023-07-03 07:57:54 +02:00
Nicolas Florentin
af69ba67df wip 2023-06-30 11:26:26 +02:00
Nicolas Florentin
50ed3c9ed2 projects to markdown in zip 2023-06-30 11:15:37 +02:00
Nicolas Florentin
82823dd4cc download project to markdown file 2023-06-29 16:37:16 +02:00
Nicolas Florentin
97c652f785 filter projects list by member 2023-06-29 14:32:06 +02:00
Nicolas Florentin
8217bb1a59 adds project categories 2023-06-29 08:47:42 +02:00
Du Peng
11a079b3e2 (bug) unable to refresh machine/space/training calender after pay an reservation 2023-06-22 11:59:52 +02:00
Du Peng
77035d81e2 Version 6.0.7 2023-06-20 15:27:23 +02:00
Du Peng
48ea7509cf (bug) Incorrect amount calculation when paying monthly subcription with a wallet 2023-06-19 21:09:26 +02:00
Du Peng
75259773d5 (bug) check object = nil 2023-06-19 21:01:01 +02:00
Du Peng
91fa1fcd85 (bug) notification type missing 2023-06-15 19:14:02 +02:00
Du Peng
4fdbd4fcf1 (bug) unable to modify the price of prepaid pack 2023-06-08 10:50:00 +02:00
Du Peng
6c5b4d9595 (bug) OpenAPI accounting gateway_object_id missing error 2023-06-02 18:33:07 +02:00
Du Peng
7cff0d6c39 Version 6.0.6 2023-05-04 14:26:15 +02:00
Du Peng
2756502131 (bug) invalid duration for machine/spaces reservations in statistics, when using slots of not 1 hour 2023-05-04 14:15:14 +02:00
Du Peng
6e9cfe11c3 Version 6.0.5 2023-05-02 18:15:49 +02:00
Du Peng
6bb74bbc6a (quality) error message for event reservation 2023-05-02 18:07:21 +02:00
Du Peng
acbe748157 (bug) unable to show calendar 2023-05-02 18:05:42 +02:00
Du Peng
47370723a8 (bug) unable to show calendar for Firefox and Safari 2023-05-02 05:49:45 -04:00
Du Peng
fe7394d9a8 Version 6.0.4 2023-04-25 16:00:18 +02:00
Du Peng
b5f4d7a541 (i18n) update locales 2023-04-25 15:29:22 +02:00
Du Peng
5bc34971d1 (bug) unable to show calendar 2023-04-25 15:11:46 +02:00
Du Peng
b588f1c780 (bug) broken notifications email 2023-04-24 19:17:07 +02:00
Du Peng
57683125a8 (bug) window end time < window start time 2023-04-21 19:28:33 +02:00
Du Peng
112df59c96 (bug) date shift in event creation/update 2023-04-21 19:27:32 +02:00
Du Peng
e39c5638b8 (quality) payzen order status 2023-04-18 10:07:30 +02:00
Du Peng
4c126a63d5 (bug) add a task for clean abuse notifications 2023-04-17 12:32:01 +02:00
Du Peng
acc081a413 (bug) logout error in payment_schedules page 2023-04-17 12:20:36 +02:00
Du Peng
b4250b2ce6 (bug) abus notification error 2023-04-17 11:31:01 +02:00
Du Peng
36d7c02776 Version 6.0.3 2023-04-12 15:51:20 +02:00
Du Peng
c478e649be (i18n) Update translations from Crowdin 2023-04-12 15:47:57 +02:00
Du Peng
c552573d35 (i18n) Update translations from Crowdin 2023-04-12 15:21:25 +02:00
Du Peng
58e8a9dff5 (security) updated Ruby to 3.2.2 2023-04-12 15:18:20 +02:00
Du Peng
371b5731fe (bug) unable to install fabmanager by setup.sh 2023-04-12 15:13:16 +02:00
dependabot[bot]
1419093479 Bump nokogiri from 1.14.2 to 1.14.3 (#447)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.14.2 to 1.14.3.
- [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.2...v1.14.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-12 15:13:16 +02:00
Vincent
994069a948 (i18n) Typo + update 2023-04-11 10:00:32 +02:00