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

1107 Commits

Author SHA1 Message Date
Sylvain
2cccbd3486 recurrence UI 2019-11-12 14:25:28 +01:00
Sylvain
96a2f6e426 create availablities with slots duration ne 60 2019-10-30 15:09:44 +01:00
Sylvain
cdc30e0da2 configure the slots duration with an environment variable 2019-10-29 16:52:52 +01:00
Nicolas Florentin
12b9155b43 try to fix edge cases of VatHistoryService, related to issue #156 2019-10-29 15:20:25 +01:00
Sylvain
1ed3eba129 [feature] export last connection date to members.xlsx 2019-10-29 11:09:17 +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
d7aed3fa1f Improved notification email to the member when a rolling subscription is taken 2019-10-23 11:43:42 +02:00
Sylvain
58821555fe Ability to set the default view in project gallery: openLab or local 2019-10-22 14:42:45 +02:00
Sylvain
d48e5602ce [bug] admins can't edit members projects 2019-10-22 14:42:35 +02:00
Sylvain
fdcec06345 CVE-2019-16892 + #49
- updated rubyzip to fix a security issue
- updated axlsx and file writing method as a possible fix for #49
2019-10-21 16:11:49 +02:00
Sylvain
528e6f5e55 admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value 2019-10-21 15:24:27 +02:00
Sylvain
e8930924e4 [bug] do not display each days in invoices for multiple days event reservation 2019-10-16 16:11:37 +02:00
Sylvain
9e1e23f268 [bug] unauthorized user can see the edit project form 2019-10-16 15:21:50 +02:00
Sylvain
ab5ee0f2d8 [bug] invoices list is not shown by default in 'manage invoices' section 2019-10-14 10:59:56 +02:00
Sylvain
bc36b78719 [bug] public calendar won't show anything if the current date range include a reserved space availability (#151) 2019-10-14 10:38:13 +02:00
Sylvain
2897eec723 various bugfixes
- in profile_complete form, the user's group is not selected by default
- missing asterisks on some required fields in profile_complete form
- renamed default DatabaseProvider from Fablab to FabManager
2019-10-09 14:41:32 +02:00
Sylvain
7dbfbc4868 fix typo 2019-10-07 17:12:49 +02:00
Sylvain
38847844fb display label on all rows in accounting export 2019-10-07 14:02:47 +02:00
Sylvain
19a125bd67 [bug] accounting export: on subscription + reservation invoice, the subscription item is exported twice 2019-10-07 12:08:08 +02:00
Sylvain
86f4c132b0 Merge branch 'cve-2015-9284' into dev 2019-10-02 16:08:40 +02:00
Sylvain
5fcf9968cb Updated Omniauth & Omniauth-oauth2 + fixed oauth2 callback url 2019-10-02 16:06:27 +02:00
Sylvain
927479733b migrated links to /users/auth from GET to POST
see https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284 for more info
2019-10-02 14:37:47 +02:00
Sylvain
2cc7fb0e44 accounting export: display lable on all lignes 2019-10-02 10:25:06 +02:00
Sylvain
35b069a4db added gem omniauth-rails_csrf_protection + [ongoing] moving from GET /users/auth/... to POST 2019-10-01 17:14:16 +02:00
Sylvain
877506b26a [bug] unable to dissociate the last machine from a formation 2019-10-01 15:27:59 +02:00
Sylvain
29d6a1daa4 Merge branch 'uvsq' into dev 2019-10-01 14:32:58 +02:00
Sylvain
a7a929ddbc integration unit test for imports + fixed import result colors in UI + fixed test fixtures 2019-10-01 14:32:30 +02:00
Sylvain
193e81e711 Merge branch 'uvsq' into dev 2019-09-30 15:34:21 +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
Sylvain
ba3161589c update users through CSV import 2019-09-30 12:19:33 +02:00
Sylvain
ff5de97c92 import new users from CSV and view results in app
TODO:
 - update users though CSV
2019-09-26 17:05:57 +02:00
Sylvain
4deaf1f75a [ongoing] import members from csv 2019-09-25 16:37:42 +02:00
Sylvain
a532efd198 upload csv file to the server through the API and save it on the disk 2019-09-24 17:42:50 +02:00
Sylvain
ede53ad761 [feature] Ability to set project's CAO attachement maximum upload size 2019-09-24 16:40:38 +02:00
Sylvain
ad1b7baa05 import members interface 2019-09-24 15:21:18 +02:00
Sylvain
8eda1e673f Merge remote-tracking branch 'origin/hotfixes' into dev 2019-09-24 14:43:14 +02:00
Sylvain
e7bb41f38d [ongoing] import users from csv file: admin inteface 2019-09-24 12:21:19 +02:00
Sylvain
f75633e64e [bug] create a plan does not set its name 2019-09-24 11:41:07 +02:00
Sylvain
588010ac0b [feature] Optional reCaptcha checkbox in sign-up form 2019-09-23 17:46:46 +02:00
Nicolas Florentin
c49db3b512 fix api/reservations#index find statistic_profile_id from the user_id because user_id is not a column of reservations table anymore 2019-09-20 15:23:53 +02:00
Nicolas Florentin
22d4d3a78a method date_range, test on all_day was never truthy 2019-09-20 15:03:49 +02:00
Nicolas Florentin
401df4cb77 delay_for does not exist anymore in sidekiq 5 2019-09-20 15:01:27 +02:00
Sylvain
de1cc2013a [bug] after disabling a group, its associated plans are hidden from the interface
+ validate server-side that there's no more user in the group to disable
2019-09-19 15:34:21 +02:00
Sylvain
668eb43959 [bug] in case of unexpected server error during stripe payment process, the confirm button is not unlocked 2019-09-19 15:00:27 +02:00
Sylvain
a7dc3b2431 factorized invoice reference & order number code 2019-09-19 14:59:22 +02:00
Sylvain
2d6f5c3e81 wallet client line in accounting export + factorized accountingExportService 2019-09-19 13:57:33 +02:00
Sylvain
7d26932f6c configure accounting codes & labels for wallet clients and other means clients 2019-09-19 11:51:14 +02:00
Sylvain
c76563f22f wallet label in accounting export 2019-09-19 11:25:12 +02:00