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

2151 Commits

Author SHA1 Message Date
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
df26e4de4a updated changelog 2019-11-07 19:38:29 +01:00
Sylvain
ccea6ac172
Merge pull request #157 from sleede/dependabot/bundler/loofah-2.3.1
Bump loofah from 2.3.0 to 2.3.1
2019-11-07 19:33:15 +01:00
dependabot[bot]
279e5f692b
Bump loofah from 2.3.0 to 2.3.1
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/master/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.3.0...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-07 18:00:54 +00:00
Sylvain
a42e9daa7f Merge branch 'hotfix' into dev 2019-10-30 16:36:30 +01:00
Sylvain
93f8c4452f Merge branch 'hotfix' for release 4.2.4 2019-10-30 15:59:07 +01:00
Sylvain
a87243f212 Version 4.2.4 2019-10-30 15:58:50 +01:00
Sylvain
9b3c2fab36 updated changelog 2019-10-30 15:53:20 +01:00
Sylvain
c6c0881e84 updated changelog 2019-10-30 15:52:13 +01:00
Nicolas Florentin
9629782be7 try to fix edge cases of VatHistoryService, related to issue #156 2019-10-30 15:50:47 +01:00
Sylvain
a2597a982e updated changelog 2019-10-30 15:45:54 +01:00
Sylvain
a755f34372 updated changelog 2019-10-30 15:44:00 +01:00
Sylvain
d044a3147a Ability to configure the duration of a reservation slot
Merge branch 'slot-duration' into dev
2019-10-30 15:39:41 +01:00
Sylvain
8f04ea436e updated changelog 2019-10-30 15:39:30 +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
398af2e8e0 updated moment-timezone 2019-10-23 10:20:07 +02:00
Sylvain
ab79a5a43b updated dev version 2019-10-22 16:47:22 +02:00
Sylvain
c0acfe0f1c handle ctrl-c in upgrade scripts 2019-10-22 16:46:40 +02:00
Sylvain
d5b9491316 Merge branch 'dev' for release 4.2.3 2019-10-22 14:46:27 +02:00
Sylvain
b4ee2f9b85 Version 4.2.3 2019-10-22 14:46:18 +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
c28d75f59e Merge branch 'dev' for release 4.2.2 2019-10-22 12:52:02 +02:00
Sylvain
9aa69a3fac Version 4.2.2 2019-10-22 12:51:56 +02:00
Sylvain
0555883ea3 fix read path 2019-10-22 12:20:00 +02:00
Sylvain
a787814c6a debug pg_upgrade command 2019-10-22 11:54:37 +02:00
Sylvain
a04fc168ee make script executable 2019-10-22 11:48:24 +02:00
Sylvain
97f893150f double confirm on clean + fix read_path 2019-10-22 11:47:04 +02:00
Sylvain
5fb1ad781b revert if cmd to using 0 2019-10-22 11:25:34 +02:00
Sylvain
719bb31968 redirect ioctl err messages to /dev/null 2019-10-22 11:10:17 +02:00
Sylvain
8217918cec enlight pg upgrade script 2019-10-22 11:04:21 +02:00
Sylvain
719250877e pg upgrade script: fix ip test 2019-10-22 10:58:07 +02:00
Sylvain
cc74b42a2b fix bash: if cmd 2019-10-22 10:54:48 +02:00
Sylvain
cbd93ca7d8 pgSQL upgrade script: check for postmaster.pid 2019-10-22 10:45:23 +02:00
Sylvain
6fcf0b76da Merge branch 'dev' for release 4.2.1 2019-10-21 16:15:49 +02:00
Sylvain
11484d2fcc Version 4.2.1 2019-10-21 16:13:56 +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
36a15fb364 fixes changelog 2019-10-21 15:40:57 +02:00
Sylvain
7d9f42da8f Merge branch 'dev' for release 4.2.0 2019-10-21 15:30:48 +02:00
Sylvain
fd2391f76e Version 4.2.0 2019-10-21 15:30:39 +02:00
Sylvain
528e6f5e55 admin invoices interface: default selected tab depending on FABLAB_WITHOUT_INVOICES value 2019-10-21 15:24:27 +02:00