Nicolas Florentin
77cf8c8218
replaces almost all Time.now by DateTime.current
2019-12-02 11:57:25 +01:00
Sylvain
90b3564138
admin calendar: surround select item by shadow-box
2019-11-27 12:31:32 +01:00
Sylvain
91008b3df1
improved calendar legend
2019-11-27 11:52:37 +01:00
Sylvain
48b811d2b5
Added freeCAD files as default allowed extensions
...
also: refactored some ruby code
2019-11-25 16:12:23 +01:00
Sylvain
68b17cbe9a
Ability to show the scheduled events in the admin calendar
2019-11-25 14:49:39 +01:00
Sylvain
563de29b9d
Calendar management: improved legend style
2019-11-25 11:59:34 +01:00
Sylvain
1182822d8b
show correct seats nb in canceled reservation
2019-11-25 10:45:54 +01:00
Sylvain
bbd613f2a5
compute right nb of free seats for event reservation
...
also: copy nb_total_places to n+1 instances when creating recurrent
availabilities
2019-11-25 10:30:12 +01:00
Sylvain
ce366beaa2
display that an event reservation was canceled
...
also: fixed transtions files
2019-11-21 11:15:05 +01:00
Sylvain
cabe2e5604
update free places after cancel event reservation
2019-11-20 17:06:42 +01:00
Sylvain
b725a5a071
Merge branch 'cancel' into dev
2019-11-20 10:27:56 +01:00
Sylvain
37d6c84cc6
[bug] unable to remove training picture
...
also: removed some invalid href=# in the templates
2019-11-19 15:18:00 +01:00
Sylvain
ad928bd4e6
ability to set phone number optional or required
...
also: show stars on required fields in new admin form
2019-11-19 11:44:32 +01:00
Sylvain
9ec736e6b5
delete recursive slots
2019-11-18 17:29:51 +01:00
Sylvain
26738563bd
create reccursive events
2019-11-18 11:50:20 +01:00
Sylvain
a60a39ff9e
[ongoing] create multiple availabilities according to UI
2019-11-13 12:13:22 +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
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
