rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-29 10:24:20 +01:00
Code Issues Releases Activity
1,459 Commits 15 Branches 273 Tags 83 MiB
9d831ef44a
Commit Graph

1459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sylvain
b279b14318 updated changelog & version 2017-08-24 12:48:03 +02:00
Sylvain
2ccc9e9dbd [bug] missing translation for EN and PT 2017-08-24 12:46:58 +02:00
Sylvain
8a4d9dd45b Merge branch 'dev' for release 2.5.10 2017-08-16 12:07:33 +02:00
Sylvain
fe58409326 Version 2.5.10 2017-08-16 12:07:08 +02:00
Sylvain
295dc3749b [bug] filename too long on events&prices API + updated axlsx 2017-08-16 12:05:04 +02:00
Sylvain
36dfbe9159 Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev 2017-07-26 10:16:45 +02:00
Sylvain
00d157dc3b [bug] filename too long error on GET api/groups 2017-07-26 10:15:47 +02:00
Nicolas Florentin
999865ba85 docker/README env variable missing in seeding database command 2017-07-24 12:26:50 +02:00
Nicolas Florentin
2b4864af74 updates CHANGELOG.md, adding the docker/README.md update 2017-07-21 14:22:28 +02:00
Nicolas Florentin
6ac1d4d48e Merge branch 'docker-readme' into dev 2017-07-21 14:21:22 +02:00
Nicolas Florentin
c6d4a6c735 rm old docker README 2017-07-21 14:19:59 +02:00
Nicolas Florentin
fa0c2f7dee fix br 2017-07-21 09:27:29 +02:00
Cyril
6ba880275f Update README.md 2017-07-20 19:54:37 +02:00
Nicolas Florentin
3e68e7d817 modifs and try fix steps of update part 2017-07-20 17:50:37 +02:00
Nicolas Florentin
5cddf8d16d modifs and try fix steps of update part 2017-07-20 17:49:18 +02:00
Nicolas Florentin
cba2751a8a fix link generate ssl certif 2017-07-20 17:43:59 +02:00
Nicolas Florentin
48a5b45e06 struggling with links 2017-07-20 17:42:55 +02:00
Nicolas Florentin
aa4ef99d02 work in progress 2017-07-20 17:37:03 +02:00
Nicolas Florentin
1833ac2890 arg 2017-07-20 17:18:19 +02:00
Nicolas Florentin
7722b55a64 fix table of contents 2017-07-20 17:17:43 +02:00
Nicolas Florentin
5305ff4c8f fix table of contents 2017-07-20 17:15:20 +02:00
Nicolas Florentin
e855fb18e5 README table of contents 2017-07-20 17:14:02 +02:00
Nicolas Florentin
0301b2959c working on docker readme 2017-07-20 16:48:34 +02:00
Sylvain
3e44d62aac [bug] filename too long error on GET api/trainings 2017-07-18 10:55:41 +02:00
Nicolas Florentin
77c7a41761 removes ADMIN_EMAIL and ADMIN_PASSWORD from docker/env.example 2017-07-13 11:15:13 +02:00
Nicolas Florentin
739d9562fd removes ADMIN_EMAIL and ADMIN_PASSWORD from Rails env because they are only used once when seeding the db 2017-07-13 11:07:09 +02:00
Nicolas Florentin
dc0b70425a Merge branch 'dev' for release 2.5.9 2017-07-13 10:11:47 +02:00