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

1194 Commits

Author SHA1 Message Date
Sylvain
e7f458e22e
Merge branch 'dev' into l10n_dev 2020-06-16 10:57:04 +02:00
Sylvain
0b881c70b8 New translations app.admin.en.yml (Spanish) 2020-06-16 10:43:11 +02:00
Sylvain
94da18296b New translations app.admin.en.yml (French) 2020-06-16 10:37:59 +02:00
Sylvain
6e14bb0d05 New translations app.admin.en.yml (French) 2020-06-16 10:35:40 +02:00
Sylvain
a3f8f4873c New translations app.admin.en.yml (Spanish) 2020-06-16 10:35:35 +02:00
Sylvain
c2b54116b1 New translations app.admin.en.yml (Portuguese) 2020-06-16 10:35:30 +02:00
Sylvain
59fca295ed New translations app.admin.en.yml (Zulu) 2020-06-16 10:35:24 +02:00
Sylvain
6bc2438348 fix translation key 2020-06-16 10:33:56 +02:00
Sylvain
130642152c New translations app.public.en.yml (French) 2020-06-16 10:18:38 +02:00
Sylvain
6552d19b2b New translations app.admin.en.yml (French) 2020-06-16 10:18:36 +02:00
Sylvain
59015241a0 New translations mails.en.yml (French) 2020-06-16 10:18:34 +02:00
Sylvain
7ec5944c1b New translations en.yml (French) 2020-06-16 10:18:33 +02:00
Sylvain
62e452a63f New translations app.admin.en.yml (French) 2020-06-16 10:11:35 +02:00
Sylvain
cad37e1c3f New translations app.admin.en.yml (French) 2020-06-16 10:01:50 +02:00
Sylvain
4393a19ce9 New translations mails.en.yml (French) 2020-06-15 18:12:35 +02:00
Sylvain
55c239f87f New translations app.admin.en.yml (French) 2020-06-15 18:12:33 +02:00
Sylvain
a6ede0c528 New translations app.public.en.yml (French) 2020-06-15 18:12:30 +02:00
Sylvain
87f898dccc New translations en.yml (Spanish) 2020-06-15 18:12:28 +02:00
Sylvain
3025f1298f New translations mails.en.yml (Spanish) 2020-06-15 18:12:24 +02:00
Sylvain
e8c30af1cd New translations app.admin.en.yml (Spanish) 2020-06-15 18:12:23 +02:00
Sylvain
99cb04060e New translations app.public.en.yml (Spanish) 2020-06-15 18:12:20 +02:00
Sylvain
734a221393 New translations en.yml (Portuguese) 2020-06-15 18:12:17 +02:00
Sylvain
c98b0988a6 New translations mails.en.yml (Portuguese) 2020-06-15 18:12:16 +02:00
Sylvain
3b4d0cea2c New translations app.admin.en.yml (Portuguese) 2020-06-15 18:12:14 +02:00
Sylvain
54499df779 New translations app.public.en.yml (Portuguese) 2020-06-15 18:12:10 +02:00
Sylvain
3e8808c4d3 New translations en.yml (Zulu) 2020-06-15 18:12:07 +02:00
Sylvain
9f0dfecc4d New translations mails.en.yml (Zulu) 2020-06-15 18:12:05 +02:00
Sylvain
49e0febe8b New translations app.admin.en.yml (Zulu) 2020-06-15 18:12:03 +02:00
Sylvain
4583e2e809 New translations app.public.en.yml (Zulu) 2020-06-15 18:12:01 +02:00
Sylvain
0b30f859e3 New translations en.yml (French) 2020-06-15 18:11:58 +02:00
Sylvain
0878ddb333 fix openAPI documentation 2020-06-15 17:44:56 +02:00
Sylvain
be9ee9d25d complete features-tour for invoices page 2020-06-15 15:56:55 +02:00
Sylvain
dbbf306bf2 complete features-tour for projects page 2020-06-15 15:43:28 +02:00
Sylvain
6af5f51ff2 complete features-tour for settings page 2020-06-15 15:32:30 +02:00
Sylvain
24155bc009 ability to lock settings from the env vars 2020-06-15 13:20:48 +02:00
Sylvain
42872ab107 configure wallet from UI 2020-06-15 12:44:43 +02:00
Sylvain
f46c78a476 read email_confirmation_required from the UI 2020-06-15 11:57:13 +02:00
Sylvain
48bcf0b838 configure invoices prefix from the DB 2020-06-15 10:58:15 +02:00
Sylvain
78518e17fb read stripe_currency from the UI
We prevent the currency from being changed if any stripe payment was made, because a stripe user cannot made pay with different currencies. If we try to charge a user with a different currency than the currency he used for a previous payment, this will fail; so we must prevent this case
2020-06-10 16:37:11 +02:00
Sylvain
82d6677cff read stripe_api_key from db 2020-06-10 11:33:03 +02:00
Sylvain
88208627c9 read stripe_public_key from the db 2020-06-10 11:02:30 +02:00
Sylvain
9ff0a06029 many sidekiq fixes 2020-06-09 18:51:57 +02:00
Sylvain
185b7b7162 updated sidekiq & redis to v6 2020-06-09 16:23:07 +02:00
Sylvain
dbda82ac9b notify after members sync on stripe 2020-06-09 15:06:46 +02:00
Sylvain
a70668f52a sync members on stripe after keys update 2020-06-09 14:27:18 +02:00
Sylvain
d5939a9de5 set the stripe keys from the UI 2020-06-09 13:09:31 +02:00
Sylvain
06b5da9df8 configure online payment from the UI 2020-06-08 17:42:59 +02:00
Sylvain
b44a8da73b set openlab_default from the UI 2020-06-08 16:15:44 +02:00
Sylvain
88f2fb3749 secure the settings API (read) + read the openlab settings from the db 2020-06-08 15:08:07 +02:00
Sylvain
db8de18bd4 set openlab-projects id & secret from the UI 2020-06-08 11:38:49 +02:00
Sylvain
6af3f12917 use the db settings to validate mime types & extensions + fix texts + force lowercase 2020-06-03 17:56:39 +02:00
Sylvain
8f32eb92db interface to manage file extensions & mime types 2020-06-03 17:39:32 +02:00
Sylvain
5c152412db test mime type of a file
use marcel to test mime types
updated mimemagic
2020-06-03 16:25:13 +02:00
Sylvain
a5e1b77ce4 check the file content with mimemagic for project CAD files 2020-06-03 12:28:04 +02:00
Sylvain
45013be950 configure default_host & default_protocol from env
reverts 478a6c40 (partially) & b2434864
2020-06-02 18:29:24 +02:00
Sylvain
1a38a8750b updated carrierware + validate file upload in front 2020-06-02 17:57:24 +02:00
Sylvain
86336e3619 fix app unable to start
message:
no connection pool with 'primary' found postgres
2020-06-02 10:25:52 +02:00
Sylvain
9a0f36c245 configure disqus_shortname from the UI 2020-06-01 18:31:43 +02:00
Sylvain
59cb17789c rename section project_elements to projects 2020-06-01 17:52:39 +02:00
Sylvain
478a6c409d define default_protocol & default_host from the UI + fix email_from + various minor fixes 2020-06-01 17:32:32 +02:00
Sylvain
0617e4cd26 configure default_mail_from from the UI 2020-06-01 12:15:16 +02:00
Sylvain
434c211ccf configure the features tour display mode from the UI 2020-05-27 18:49:53 +02:00
Sylvain
0d211e2e31 configure google recaptcha from UI 2020-05-27 16:35:30 +02:00
Sylvain
c3846e7080 configure twitter analytics from the UI 2020-05-27 15:39:39 +02:00
Sylvain
628a0f3bc3 configure facebook_app_id from the UI 2020-05-27 12:29:51 +02:00
Sylvain
2d628d8826 disable the invoicing module from the UI config panel 2020-05-26 18:07:07 +02:00
Sylvain
537743a740 configure the plans module from the admin UI 2020-05-26 15:39:28 +02:00
Sylvain
6cc6bba7ce refactored app to gather spaces module status from the settings 2020-05-26 13:59:40 +02:00
Sylvain
fd93093f0d UI to configure the spaces module 2020-05-26 10:53:49 +02:00
Sylvain
acefc325f6 configure events_in_calendar form the UI panel 2020-05-25 17:36:53 +02:00
Sylvain
57ceeec2e7 refactored settings/reservations/confidentiality section 2020-05-25 17:05:54 +02:00
Sylvain
a63340188b configure default slot duration from settings panel 2020-05-25 12:55:01 +02:00
Sylvain
ddce7f516a configuration of book concurrent slots through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
419605e551 configuration of google analytics tracking ID through the settings interface 2020-05-25 12:55:00 +02:00
Sylvain
4841027216 interface to collect the google analytics ID 2020-05-25 12:55:00 +02:00
Sylvain
13bcd9a1f8 use phoneRequired from settings instead of env 2020-05-25 12:54:19 +02:00
Sylvain
f47af21b42 delete old application.yml
this file, used in development environment, was replaced by .env since v4.3.3
2020-05-25 12:54:19 +02:00
Sylvain
654d4b1cb4 setting: phone_required 2020-05-25 12:54:19 +02:00
Sylvain
18e2b032ae fix import users from csv 2020-05-19 11:45:51 +02:00
Sylvain
af136cab71 New translations en.yml (French) 2020-05-18 09:14:27 +02:00
Sylvain
a79bcae9e1
Merge pull request #209 from sleede/l10n_dev
New Crowdin translations
2020-05-18 09:12:33 +02:00
Sylvain
826d3cd4b7 Added an option to allow usage in production without HTTPS 2020-05-13 14:03:58 +02:00
Sylvain
39c6a6cc4d New translations en.yml (Portuguese) 2020-05-13 12:17:51 +02:00
Sylvain
3f35308ad5 New translations en.yml (Zulu) 2020-05-13 12:17:48 +02:00
Sylvain
c8121b78b9 New translations en.yml (Spanish) 2020-05-13 12:17:40 +02:00
Sylvain
a275fd462a New translations en.yml (French) 2020-05-13 12:17:30 +02:00
Sylvain
7e1edef8a0 [bug] when an admin logs on the subscription page, his view is broken
Also: Prevent admins from leaving their dedicated group
2020-05-13 08:37:49 +02:00
Sylvain
a78a91c583
Merge pull request #207 from sleede/l10n_dev
New Crowdin translations
2020-05-06 17:11:26 +02:00
Sylvain
2099e6cd98 New translations app.admin.en.yml (French) 2020-05-06 17:09:24 +02:00
Sylvain
c668583965 New translations app.shared.en.yml (French) 2020-05-06 17:09:17 +02:00
Sylvain
2ea976f16e New translations app.shared.en.yml (Zulu) 2020-05-06 17:00:56 +02:00
Sylvain
ae28ae896c New translations app.admin.en.yml (French) 2020-05-06 17:00:49 +02:00
Sylvain
20005278f7 New translations app.admin.en.yml (Spanish) 2020-05-06 17:00:47 +02:00
Sylvain
df51249155 New translations app.admin.en.yml (Portuguese) 2020-05-06 17:00:44 +02:00
Sylvain
b0ac7f54c6 New translations app.shared.en.yml (French) 2020-05-06 17:00:37 +02:00
Sylvain
41103a5b7c New translations app.shared.en.yml (Spanish) 2020-05-06 17:00:35 +02:00
Sylvain
ef6fd82941 New translations app.shared.en.yml (Portuguese) 2020-05-06 17:00:33 +02:00
Sylvain
9472febf39 New translations app.admin.en.yml (Zulu) 2020-05-06 17:00:32 +02:00
Sylvain
0a336f14e4 updated messages about prices 2020-05-06 16:55:26 +02:00
Sylvain
5f7287cec7 Ask for confirmation before booking a slot for a member without the required tag 2020-05-06 15:32:40 +02:00
Sylvain
6d0ed0bfb5 info box for current availabity in admin calendar 2020-05-05 16:19:46 +02:00
Sylvain
f1e0bce08b
Merge branch 'dev' into l10n_dev 2020-05-05 11:50:01 +02:00
Sylvain
49bfb7e725 New translations mails.en.yml (French) 2020-05-05 11:47:41 +02:00
Sylvain
eaada1fc9f New translations app.admin.en.yml (French) 2020-05-05 11:47:38 +02:00
Sylvain
330c4e95b5 New translations en.yml (Spanish) 2020-05-05 11:47:36 +02:00
Sylvain
51a4de289a New translations en.yml (French) 2020-05-05 11:47:29 +02:00
Sylvain
2c72d757bf New translations en.yml (Portuguese) 2020-05-05 11:38:06 +02:00
Sylvain
da3593c8b4 New translations en.yml (Zulu) 2020-05-05 11:38:05 +02:00
Sylvain
117139c819 New translations mails.en.yml (French) 2020-05-05 11:38:01 +02:00
Sylvain
c3acd235b9 New translations mails.en.yml (Spanish) 2020-05-05 11:38:00 +02:00
Sylvain
4320977ff7 New translations mails.en.yml (Portuguese) 2020-05-05 11:37:58 +02:00
Sylvain
a7e8a19921 New translations mails.en.yml (Zulu) 2020-05-05 11:37:56 +02:00
Sylvain
a610965a3c New translations app.admin.en.yml (French) 2020-05-05 11:37:55 +02:00
Sylvain
a48c3baace New translations app.admin.en.yml (Spanish) 2020-05-05 11:37:53 +02:00
Sylvain
a72f69fb29 New translations en.yml (Spanish) 2020-05-05 11:37:51 +02:00
Sylvain
413b6b0512 New translations app.admin.en.yml (Portuguese) 2020-05-05 11:37:49 +02:00
Sylvain
b299f53844 New translations app.public.en.yml (Spanish) 2020-05-05 11:37:45 +02:00
Sylvain
02dbb0e2b6 New translations app.admin.en.yml (Zulu) 2020-05-05 11:37:41 +02:00
Sylvain
e68cdba9f5 New translations en.yml (French) 2020-05-05 11:37:40 +02:00
Sylvain
03445e4793 New translations app.admin.en.yml (French) 2020-05-05 11:32:04 +02:00
Sylvain
a9d3a4cc97 New translations app.admin.en.yml (Spanish) 2020-05-05 11:32:02 +02:00
Sylvain
cc4b42a01b New translations app.admin.en.yml (Portuguese) 2020-05-05 11:32:00 +02:00
Sylvain
8600077dd9 New translations app.admin.en.yml (Zulu) 2020-05-05 11:31:59 +02:00
Sylvain
2ae03e3b27 New translations app.public.en.yml (Spanish) 2020-05-05 11:31:54 +02:00
Sylvain
aae56404b7 New translations app.public.en.yml (Portuguese) 2020-05-05 11:31:53 +02:00
Sylvain
2d8df2c1cd Ability to promote a user to a higher role (member > manager > admin) 2020-05-05 11:28:04 +02:00
Sylvain
06a5bff084 [ongoing] change user role 2020-05-04 18:32:25 +02:00
Sylvain
881cc97e8d The invoices list displays the operator in case of offline payment 2020-05-04 10:56:27 +02:00
Sylvain
ad52f825fa
Merge branch 'dev' into l10n_dev 2020-04-29 17:12:51 +02:00
Sylvain
4566838965 New translations app.admin.en.yml (Spanish) 2020-04-29 17:07:21 +02:00
Sylvain
a58cf8a219 New translations app.admin.en.yml (Portuguese) 2020-04-29 17:07:20 +02:00
Sylvain
27438701eb New translations app.public.en.yml (Spanish) 2020-04-29 17:07:15 +02:00
Sylvain
6d11bfc57e New translations app.public.en.yml (Portuguese) 2020-04-29 17:07:14 +02:00
Sylvain
2b5f14ee0a New translations app.public.en.yml (French) 2020-04-29 16:55:26 +02:00
Sylvain
a6c5e5c2f3 New translations app.public.en.yml (French) 2020-04-29 16:54:10 +02:00
Sylvain
c19425f32e New translations app.public.en.yml (Spanish) 2020-04-29 16:54:08 +02:00
Sylvain
4d50f7270d New translations app.public.en.yml (Portuguese) 2020-04-29 16:54:06 +02:00
Sylvain
fae69d0a00 New translations app.public.en.yml (Zulu) 2020-04-29 16:54:05 +02:00
Sylvain
a4d8c893ab New translations app.admin.en.yml (French) 2020-04-29 16:53:56 +02:00
Sylvain
3bc8e69cf0 fix typo 2020-04-29 16:52:57 +02:00
Sylvain
c2e6be3de0 New translations app.admin.en.yml (French) 2020-04-29 16:33:30 +02:00
Sylvain
81e5395b12 New translations app.admin.en.yml (Spanish) 2020-04-29 16:33:29 +02:00
Sylvain
c4ff2772cd New translations app.admin.en.yml (Portuguese) 2020-04-29 16:33:26 +02:00
Sylvain
28b1c34658 New translations app.public.en.yml (French) 2020-04-29 16:33:22 +02:00
Sylvain
8a5742b0dc New translations app.public.en.yml (Spanish) 2020-04-29 16:33:20 +02:00
Sylvain
fb55213586 New translations app.public.en.yml (Portuguese) 2020-04-29 16:33:19 +02:00
Sylvain
ecd92e12c1 New translations app.public.en.yml (Zulu) 2020-04-29 16:33:17 +02:00
Sylvain
5f46865c1e New translations app.admin.en.yml (Zulu) 2020-04-29 16:33:13 +02:00
Sylvain
b97ff2ec5b improved feature tour for managers 2020-04-29 16:30:39 +02:00
Sylvain
ff9636e12f help tour for managers 2020-04-29 15:20:39 +02:00
Sylvain
68fd322398 managers: edit user/edit subscription 2020-04-29 11:11:57 +02:00
Sylvain
35ce577651 [bug] subscription page shows the groups without any active plans
[bug] cart price inconsistently updated after a subscription
[feature] plans page for managers
2020-04-29 10:57:32 +02:00
Sylvain
05479e043c [ongoing] plans interface for managers 2020-04-28 18:11:25 +02:00
Sylvain
6a8746b110 [bug] updating a setting without any changes triggers an error
Also:
- Invoices interface for managers
- Refactoring of admin/invoices template: split into multiple files
2020-04-28 16:35:54 +02:00
Sylvain
18895b6a85 manager can create memebrs & credit wallets 2020-04-28 15:34:17 +02:00
Sylvain
e56fba1c03 [bug] Free entry label for events without reservation 2020-04-28 11:21:04 +02:00
Sylvain
c45c92e86a basic manager menu 2020-04-22 12:31:44 +02:00
Sylvain
91165d0432 Merge branch 'dev' into manager 2020-04-22 09:39:37 +02:00
Sylvain
0712db5cdf
Merge pull request #200 from sleede/l10n_dev
New Crowdin translations
2020-04-22 09:38:43 +02:00
Sylvain
02ce7a4fbf New translations app.shared.en.yml (Spanish) 2020-04-22 09:38:10 +02:00
Sylvain
d0e4aa91ee New translations app.admin.en.yml (French) 2020-04-22 09:32:03 +02:00
Sylvain
d0e6764f24 New translations app.shared.en.yml (French) 2020-04-22 09:32:00 +02:00
Sylvain
52b408647c New translations app.shared.en.yml (Portuguese) 2020-04-22 09:31:56 +02:00
Sylvain
2ca5c8c50f managers interface 2020-04-21 17:24:22 +02:00
Sylvain
c350c9bd17 New translations app.admin.en.yml (French) 2020-04-21 16:56:20 +02:00
Sylvain
d80f34f521 New translations app.admin.en.yml (Portuguese) 2020-04-21 16:56:17 +02:00
Sylvain
7c5a22c308 New translations app.admin.en.yml (Spanish) 2020-04-21 16:56:14 +02:00
Sylvain
c929e001fc New translations app.admin.en.yml (Zulu) 2020-04-21 16:56:11 +02:00
Sylvain
f88472eeb3 Interface to manage partners 2020-04-21 16:47:35 +02:00
Sylvain
dec628df93 New translations app.admin.en.yml (French) 2020-04-21 15:31:32 +02:00
Sylvain
23705e9df8 New translations app.admin.en.yml (Portuguese) 2020-04-21 15:31:28 +02:00
Sylvain
24c4713d4c New translations app.admin.en.yml (Spanish) 2020-04-21 15:31:24 +02:00
Sylvain
5d7ccf378c New translations app.admin.en.yml (Zulu) 2020-04-21 15:31:20 +02:00
Sylvain
d717ed704c adjust nb of slots per availability 2020-04-21 15:20:33 +02:00
Sylvain
91953d2ca1
Merge pull request #199 from sleede/l10n_dev
New Crowdin translations
2020-04-20 11:34:33 +02:00
Sylvain
bf49eef81a New translations app.admin.en.yml (Portuguese) 2020-04-20 11:07:41 +02:00
Sylvain
161d5ce9b4 New translations app.admin.en.yml (Portuguese) 2020-04-20 11:03:09 +02:00
Sylvain
943360a388 New translations app.admin.en.yml (Spanish) 2020-04-20 11:03:05 +02:00
Sylvain
874324eb8c New translations app.shared.en.yml (Portuguese) 2020-04-20 10:56:30 +02:00
Sylvain
93210a3b86 New translations app.shared.en.yml (French) 2020-04-20 10:54:49 +02:00
Sylvain
eb9054332e New translations app.shared.en.yml (Zulu) 2020-04-20 10:25:44 +02:00
Sylvain
48374a9e9d New translations app.shared.en.yml (French) 2020-04-20 10:25:41 +02:00
Sylvain
8f44f695c9 New translations app.shared.en.yml (Portuguese) 2020-04-20 10:25:39 +02:00
Sylvain
10415ffa91 New translations app.shared.en.yml (Spanish) 2020-04-20 10:25:36 +02:00
Sylvain
92866d85c4 New translations app.admin.en.yml (French) 2020-04-20 10:23:23 +02:00
Sylvain
38ae5178bc New translations app.admin.en.yml (Portuguese) 2020-04-20 10:23:04 +02:00
Sylvain
9cc4ac4b05 New translations app.admin.en.yml (Spanish) 2020-04-20 10:22:43 +02:00
Sylvain
fc0f153e8a fixed strings 2020-04-20 10:20:42 +02:00
Sylvain
925f38024c New translations app.admin.en.yml (French) 2020-04-20 10:01:20 +02:00
Sylvain
be945e7d6f New translations app.admin.en.yml (Portuguese) 2020-04-20 10:01:18 +02:00
Sylvain
a913ec4c22 New translations app.admin.en.yml (Spanish) 2020-04-20 10:01:15 +02:00
Sylvain
d4a1dd5851 New translations app.admin.en.yml (Zulu) 2020-04-20 10:01:12 +02:00
Sylvain
d665c71157 non-english transations admit some more accordances 2020-04-20 10:00:24 +02:00
Sylvain
6b8ecfda7c New translations app.admin.en.yml (French) 2020-04-20 09:56:20 +02:00
Sylvain
8126af7f1b New translations app.admin.en.yml (French) 2020-04-20 09:50:24 +02:00
Sylvain
7852877554 New translations app.admin.en.yml (Portuguese) 2020-04-20 09:50:20 +02:00
Sylvain
e7588009d4 New translations app.admin.en.yml (Spanish) 2020-04-20 09:50:16 +02:00
Sylvain
5d44f6abc8 New translations app.admin.en.yml (Zulu) 2020-04-20 09:50:11 +02:00
Sylvain
5f90393fb1 updated sentences to match customizable duration of slots 2020-04-20 09:48:20 +02:00
Sylvain
ff75a96ecc Ability to define, per availability, a custom duration for the reservation slots 2020-04-15 18:08:02 +02:00