rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-11 22:24:21 +01:00
Code Issues Releases Activity
1,586 Commits 15 Branches 273 Tags 82 MiB
857b1cebba
Commit Graph

1586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
siteswapjuggler
cda13540f9 limit parameter removed 
as requested
 2017-09-24 18:39:32 +02:00
siteswapjuggler
5fe1a53237 double slashes correction in open API event JSON 
correction of the double slash as requested
 2017-09-24 18:37:08 +02:00
siteswapjuggler
22982a2356 Merge remote-tracking branch 'LaCasemate/master' 2017-09-24 18:17:58 +02:00
siteswapjuggler
3e2e5f5972 cancelled event management on front page 
Cancelled event (nb_total_places = -1) are not prompted anymore on the
homepage >> no need to push them to the final user.

They are still display in the event module for continuity
 2017-09-24 18:17:40 +02:00
siteswapjuggler
37bdfcb96f pull request modification 
Modification as requested for the pull request.
 2017-09-24 15:12:46 +02:00
Sylvain
8d92f8492a removed full-calendar hack, improved remove slot precess 2017-09-18 12:42:45 +02:00
Sylvain
7d9d0cd075 updated changelog 2017-09-18 11:02:27 +02:00
Sylvain
03b5b8bfae fix typo in FR 2017-09-18 11:00:42 +02:00
Sylvain
db88eea8ba update test data, allow passing test suite 2017-09-18 11:00:20 +02:00
Sylvain
6efb4eb773 Merge branch 'dev' for release 2.5.14 2017-09-12 08:43:53 +02:00
Sylvain
8b1b39dc49 Version 2.5.14 2017-09-12 08:43:28 +02:00
Sylvain
d6ef5704b7 [bug] incomplete error message during fix:recursive_events_over_DST 2017-09-12 08:39:07 +02:00
Sylvain
1cf2dc6f09 Merge branch 'dev' for release 2.5.13 2017-09-11 16:39:53 +02:00
Sylvain
b4ad300a2c Version 2.5.13 2017-09-11 16:39:00 +02:00
Sylvain
30acf4de19 updated changelog 2017-09-11 16:37:21 +02:00
Sylvain
de6ea6ff14 [bug] recursive_events_over_DST fail with deleted events 2017-09-11 16:32:33 +02:00
Sylvain
98c8e3a906 Merge branch 'dev' for release 2.5.12 2017-09-11 14:17:42 +02:00
Sylvain
c7b88c29b2 Version 2.5.12 2017-09-11 14:17:26 +02:00
Sylvain
54d686f1ac [bug] home events overflow 2017-09-11 14:10:52 +02:00
Sylvain
d0f2459ea8 updated link to env vars doc 2017-09-11 13:07:35 +02:00
Sylvain
b594486d0b updated deploy instructions for 2.5.11 2017-09-11 12:29:22 +02:00
Sylvain
8ac716af55 [bug]ActiveRecord::RecordNotFound during fix:recursive_events_over_DST 2017-09-11 10:39:40 +02:00
siteswapjuggler
52071c7b83 Merge remote-tracking branch 'LaCasemate/master' 2017-09-10 12:01:59 +02:00
Sylvain
ced1d797a2 Merge branch 'dev' for relase 2.5.11 2017-09-07 15:03:04 +02:00
Sylvain
75cb28e401 Version 2.5.11 2017-09-07 15:02:10 +02:00
Sylvain
f5e2a44dcf [bug] in public calendar, availabilities are not shown to visitors 2017-09-07 11:44:50 +02:00
Sylvain
a822481d39 updated changelog 2017-09-07 10:54:42 +02:00
Sylvain
f4ddd92b40 [feature] ability to block new reservations (#78) 
On a machine, space or training availability slot, if there's no current reservation or if all reservations were cancelled, the slot can be locked to prevent any new reservations on it. Once locked it will disapear from the members calendars. The admins can also to unlock these slots later.
 2017-09-07 10:48:21 +02:00
Sylvain
404101ccd4 english and portuguese translations 2017-09-07 10:47:18 +02:00
Sylvain
273ec5317d disallow locking availabilities if it has any non-cancelled reservations 2017-09-06 18:07:56 +02:00
Sylvain
57228f4eec hide slots in members calendars if locked 2017-09-06 17:10:10 +02:00
Sylvain
9caa3ff56f hide slots in members calendars if locked 2017-09-06 17:09:40 +02:00
Sylvain
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02:00
Sylvain
82511aa781 [feature] prevent creation of irregular yearly plans 2017-09-05 17:01:09 +02:00
Sylvain
53c1a72060 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-09-05 10:43:24 +02:00
Sylvain
c43d0d816f updated changelog 2017-09-05 10:42:14 +02:00
Sylvain
f43cd60403 Merge branch 'dst' into dev (fix for #77) 2017-09-05 10:37:21 +02:00
Sylvain
9f136b479a rake task to fix existing recursive events 2017-09-05 10:36:49 +02:00
Sylvain
1af07f5e54 [ongoing] rake task to fix existing recursive events 2017-09-04 17:27:18 +02:00
Sylvain
31cdc5c695 [bug] reccursive events have difference with requested time when crossing DST (#77) 2017-09-04 16:50:07 +02:00
siteswapjuggler
e13817176f event monitor improvement 
Many imrovement for the event monitoring admin module.
 2017-09-04 00:09:08 +02:00
siteswapjuggler
73c9e301fb open api events improvement 
new data available: start_at, end_at, event_image
new controllers: id, upcoming, limit
 2017-09-03 13:55:38 +02:00
Sylvain
112b174e5f [bug] invalid time for reccurent events after Daylight Saving Time change 2017-08-31 17:32:04 +02:00
Nicolas Florentin
d602055e67 In login modal, displays an alert if Caps lock key is pressed 2017-08-31 17:11:46 +02:00
Sylvain
3d4260a3f7 [bug] unable to delete standard group 2017-08-30 14:57:06 +02:00
Sylvain
9c6143bd5e tooltip about images insertion in medium editor 2017-08-29 17:50:57 +02:00
Sylvain
dcf55d8351 [bug] invalid notification text when sending amount coupon 2017-08-29 16:10:16 +02:00
Sylvain
cf6afb817d [feature] configuration of max visibility for reservations 2017-08-24 18:34:18 +02:00
Sylvain
eb4f97000d [bug] admin cannot see all space availabilities 2017-08-24 16:53:27 +02:00
Sylvain
9f235d5c3b ArchLinux compatibility 2017-08-24 16:08:42 +02:00