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

380 Commits

Author SHA1 Message Date
Sylvain
e7f458e22e
Merge branch 'dev' into l10n_dev 2020-06-16 10:57:04 +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
6552d19b2b New translations app.admin.en.yml (French) 2020-06-16 10:18:36 +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
55c239f87f New translations app.admin.en.yml (French) 2020-06-15 18:12:33 +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
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
45013be950 configure default_host & default_protocol from env
reverts 478a6c40 (partially) & b2434864
2020-06-02 18:29:24 +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
654d4b1cb4 setting: phone_required 2020-05-25 12:54:19 +02:00
Sylvain
2099e6cd98 New translations app.admin.en.yml (French) 2020-05-06 17:09:24 +02:00
Sylvain
ae28ae896c New translations app.admin.en.yml (French) 2020-05-06 17:00:49 +02:00
Sylvain
f1e0bce08b
Merge branch 'dev' into l10n_dev 2020-05-05 11:50:01 +02:00
Sylvain
eaada1fc9f New translations app.admin.en.yml (French) 2020-05-05 11:47:38 +02:00
Sylvain
a610965a3c New translations app.admin.en.yml (French) 2020-05-05 11:37:55 +02:00
Sylvain
03445e4793 New translations app.admin.en.yml (French) 2020-05-05 11:32:04 +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
881cc97e8d The invoices list displays the operator in case of offline payment 2020-05-04 10:56:27 +02:00
Sylvain
a4d8c893ab New translations app.admin.en.yml (French) 2020-04-29 16:53:56 +02:00
Sylvain
c2e6be3de0 New translations app.admin.en.yml (French) 2020-04-29 16:33:30 +02:00
Sylvain
d0e4aa91ee New translations app.admin.en.yml (French) 2020-04-22 09:32:03 +02:00
Sylvain
c350c9bd17 New translations app.admin.en.yml (French) 2020-04-21 16:56:20 +02:00
Sylvain
dec628df93 New translations app.admin.en.yml (French) 2020-04-21 15:31:32 +02:00
Sylvain
92866d85c4 New translations app.admin.en.yml (French) 2020-04-20 10:23:23 +02:00
Sylvain
925f38024c New translations app.admin.en.yml (French) 2020-04-20 10:01:20 +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
a63071342c New translations app.admin.en.yml (French) 2020-03-31 17:27:51 +02:00
Sylvain
4fae34a5b2 New translations app.admin.en.yml (French) 2020-03-31 17:11:52 +02:00
Sylvain
9ed6244582 New translations app.admin.en.yml (French) 2020-03-31 17:00:59 +02:00
Sylvain
b8ce9f7fd7 New translations app.admin.en.yml (French) 2020-03-31 16:17:32 +02:00
Sylvain
a7ecca5095 New translations app.admin.en.yml (French) 2020-03-11 12:11:15 +01:00
Sylvain
da437711a4 New translations app.admin.en.yml (French) 2020-03-11 10:40:34 +01:00
Sylvain
60cf79a2b4
Merge pull request #186 from sleede/l10n_dev
New Crowdin translations
2020-03-11 10:33:40 +01:00
Sylvain
e44499d7ee fixed some translations 2020-03-11 10:04:32 +01:00
Sylvain
5a3fc03199 New translations app.admin.en.yml (French) 2020-03-11 09:43:00 +01:00
Sylvain
9160c3cbba New translations app.admin.en.yml (French) 2020-03-11 09:22:27 +01:00
Sylvain
2c1dbd4d82 [ongoing] help modal 2020-03-10 16:38:29 +01:00
Sylvain
ca1f0105de New translations app.admin.en.yml (French) 2020-03-09 12:30:48 +01:00
Sylvain
75f96b34a2 New translations app.admin.en.yml (French) 2020-03-09 12:18:59 +01:00
Sylvain
468f9d0f89 New translations app.admin.en.yml (French) 2020-03-09 12:11:05 +01:00
Sylvain
bb752f1218 refactor translations to work with crowdin pull requests 2020-03-09 11:47:18 +01:00
Sylvain
8976336a6a updated user's manual for v4.3 (fr) 2020-03-04 17:24:06 +01:00
Sylvain
5301a237ca Change style and pluralize the text of the slot division alert in new availability assistant 2020-03-04 14:42:00 +01:00
Sylvain
8a1518dabc prevent admin from changing group + add info about configuring groups first 2020-03-03 11:59:17 +01:00
Sylvain
f5955b74d2 reposition tour modals to prevent screen overflow
also: fix issue on tour completed
+ fix issue on statistics when no plans created
+ info area on statistics when no plans created
2020-03-03 11:20:17 +01:00
Sylvain
5765e3d2e4 move availability options to new step + wording 2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
f34b87c597 harmonized translations 2020-03-02 15:29:19 +01:00
Sylvain
38b196feb8 rearrange main menu 2020-02-26 18:05:09 +01:00
Sylvain
fc5b935495 helpers between reservables screens 2020-02-26 17:30:27 +01:00
Sylvain
a62e31090e tours wording 2020-02-26 16:49:29 +01:00
Sylvain
fdc8ec6a9e import icalendars every hours 2020-02-26 16:04:40 +01:00
Sylvain
c111fca980 alert about slots division on availability creation 2020-02-26 15:58:41 +01:00
Sylvain
0ea7e774d3 wording in training & calendar tours + label on ical button 2020-02-26 15:48:42 +01:00
Sylvain
7143801641 start help tour by clicking on help in user menu
also: tour descriptions of home page items
2020-02-26 15:13:58 +01:00
Sylvain
d71a1b7cbd improve settings/privacy tab 2020-02-26 12:20:33 +01:00
Sylvain
d833f6d812 harmonize Fab-manager trademark syntax 2020-02-26 10:19:43 +01:00
Sylvain
cf8fb0659b open-api tour 2020-02-25 11:47:30 +01:00
Sylvain
9f9656caa4 settings tour 2020-02-25 11:40:01 +01:00
Sylvain
a56f6c4e18 statistics tour 2020-02-25 11:06:03 +01:00
Sylvain
31dce73f14 project elements tour 2020-02-25 10:47:16 +01:00
Sylvain
64e41910ec trainings tour: change tab on tracking step
invoices tour: do not show listing steps if invoicing is disabled
+ typo
2020-02-25 09:48:55 +01:00
Sylvain
7dd5979d64 texts for projects elements and statistics tours 2020-02-24 17:17:51 +01:00
Sylvain
c13ba85230 events tour 2020-02-24 16:21:12 +01:00
Sylvain
f8f1dde14a pricing tour 2020-02-24 15:02:45 +01:00
Sylvain
807a9596a8 invoices tour 2020-02-24 11:55:13 +01:00
Sylvain
9f68375ae9 admin calendar tour 2020-02-24 10:33:27 +01:00
Sylvain
496e926abd fix members tour if no member 2020-02-19 14:39:45 +01:00
Sylvain
bc63465a84 members tour 2020-02-19 14:30:56 +01:00
Sylvain
906decb620 [ongoing] members tour 2020-02-19 13:00:38 +01:00
Sylvain
05a29a54b3 trainings tour 2020-02-19 10:22:32 +01:00
Du Peng
b559d10b87 improve slot is only subscription 2020-02-12 12:58:17 +01:00
Sylvain
e1902b42ac remove confusing quotes in translations yml 2020-02-11 15:49:43 +01:00
Sylvain
b7dda83060 Merge branch 'edit_event_recurrent' into dev 2020-02-11 15:43:29 +01:00
Sylvain
db26533d94 alert on date change 2020-02-11 15:42:43 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Sylvain
b1a98d3574 improved texts 2020-01-29 17:44:17 +01:00
Du Peng
35d9bec8a5 update event recurrent 2020-01-29 17:20:19 +01:00
Sylvain
81a42e5935 customize home page : full texts 2020-01-28 10:12:29 +01:00
Du Peng
b1419271e6 edit event recurrent in progress 2020-01-27 18:21:46 +01:00
Sylvain
656a603d6c customize home page css 2020-01-27 17:10:29 +01:00
Sylvain
b85c7ac00b admin set its customized html template for the home page & can reset it to factory value 2020-01-22 11:53:40 +01:00
Sylvain
15ab3c1305 Ability to customize the title of the link to the about page 2020-01-21 16:16:12 +01:00
Sylvain
45e4b5c4bc Create machine availabilities: select all/none in a click 2020-01-21 12:09:24 +01:00
Sylvain
7929d3b198 detailled view of collected data in fabanalytics 2020-01-15 12:48:55 +01:00
Sylvain
059096c2dd privacy option for fab-analytics 2020-01-15 10:46:04 +01:00
Sylvain
1c4f144b8d Merge branch 'members-filters' into dev 2020-01-07 10:44:55 +01:00
Sylvain
d4f7ff3603 fixes comments syntax for crowdin compat 2019-12-24 11:47:31 +01:00
Nicolas Florentin
62c979cfc0 members filters, translations for other languages are still needed 2019-12-20 15:47:42 +01:00
Sylvain
c5604bbdf8 harmonize admin.en 2019-12-18 13:26:37 +01:00
Sylvain
14c3abb449 refactoring i18n keys: trainings + modals + various missings 2019-12-18 13:04:38 +01:00
Sylvain
a7b423b151 refactoring i18n keys - admin 2019-12-17 18:06:56 +01:00
Sylvain
88c48e4e69 [ongoing] refactoring i18n keys - admin 2019-12-17 12:40:36 +01:00
Sylvain
d21f616283 [ongoing] refactoring i18n keys 2019-12-16 16:54:40 +01:00
Sylvain
c565d9ff2b unified front-end i18n interpolations syntax to messageformat 2019-12-16 10:16:11 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
32e7fc3900 confirm delete icalendar imports + fix display + add translations 2019-12-03 10:48:53 +01:00
Sylvain
55d2c88134 delete & sync ical sources 2019-12-02 12:19:30 +01:00
Sylvain
36eba99808 [bug] report errors on admin creation 2019-12-02 10:39:42 +01:00
Sylvain
97d93cd622 added a name to imported calendar 2019-11-27 17:39:19 +01:00
Sylvain
9e2134c9cf ics sources configuration interface 2019-11-27 16:17:42 +01:00
Sylvain
91008b3df1 improved calendar legend 2019-11-27 11:52:37 +01:00
Sylvain
68b17cbe9a Ability to show the scheduled events in the admin calendar 2019-11-25 14:49:39 +01:00
Sylvain
5d358efb9f correct conjugation for event canceled 2019-11-25 10:50:32 +01:00
Sylvain
ce366beaa2 display that an event reservation was canceled
also: fixed transtions files
2019-11-21 11:15:05 +01:00
Sylvain
9ec736e6b5 delete recursive slots 2019-11-18 17:29:51 +01:00
Sylvain
0d740c95a9 recapitulative screen 2019-11-13 10:59:10 +01:00
Sylvain
22251e6516 summary screen
TODO: eventModal.html.erb:167
2019-11-12 16:28:10 +01:00
Sylvain
2cccbd3486 recurrence UI 2019-11-12 14:25:28 +01:00
Sylvain
f94d8feba6 [feature] admin can delete an user 2019-10-29 09:59:21 +01:00
Sylvain
35fb991cdb Improved user experience in defining slots in the calendar management 2019-10-23 17:48:31 +02:00
Sylvain
7dbfbc4868 fix typo 2019-10-07 17:12:49 +02:00
Sylvain
0d3cc0fe40 [feature] Ability to disable invoices generation and interfaces 2019-09-30 15:29:20 +02:00
Sylvain
8bd1d72fdf improved results page 2019-09-30 12:49:50 +02:00