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

187 Commits

Author SHA1 Message Date
Sylvain
601ac177b6 [bug] rendering for social networks shares 2017-09-26 15:48:47 +02:00
Sylvain
f874748f74 [bug] fix events monitoring pagination 2017-09-25 15:48:21 +02:00
Sylvain
f5e2a44dcf [bug] in public calendar, availabilities are not shown to visitors 2017-09-07 11:44:50 +02:00
Sylvain
57228f4eec hide slots in members calendars if locked 2017-09-06 17:10:10 +02:00
Sylvain
d092a1c5ea admin can lock and unlock availbilities 2017-09-06 15:01:41 +02:00
Sylvain
3d4260a3f7 [bug] unable to delete standard group 2017-08-30 14:57:06 +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
Peng DU
2cc8096236 fix bug: cant get list of training reservation 2017-03-28 19:45:36 +02:00
Sylvain
38ce1b23b7 fix duplicates SLOT_DURATION declarations 2017-03-13 10:21:41 +01:00
Sylvain
796f0a87ae ability to remove an unused custom price for an event (#61) 2017-03-02 18:36:54 +01:00
Sylvain
504fe49964 export machines availabilities 2017-03-02 12:34:28 +01:00
Sylvain
f208caf5b0 fix change space reservation when many users on the slot does not change the good user 2017-03-01 14:47:59 +01:00
Sylvain
d450301934 [to test] space reservations 2017-02-28 18:13:38 +01:00
Sylvain
4a9fb5855f filter spaces in client calendar 2017-02-28 17:17:43 +01:00
Sylvain
c936b283f7 display spaces status in client calendar 2017-02-28 16:51:56 +01:00
Sylvain
0e94f8c3d4 Redo "change DB model to allow many_to_many relationship between Slot and Reservation"
This reverts commit 4cbfbdc4e0.
2017-02-28 13:23:31 +01:00
Sylvain
4cbfbdc4e0 Revert "change DB model to allow many_to_many relationship between Slot and Reservation"
This reverts commit 03d922e214.
2017-02-28 12:36:50 +01:00
Sylvain
a0e7e7951f [ongoing] display spaces in public calendar 2017-02-28 11:59:48 +01:00
Sylvain
b5a0b43689 fix manage reservations 2017-02-27 16:43:39 +01:00
Sylvain
6a132948af fixed slots display in space reservation calendar 2017-02-27 16:35:41 +01:00
Sylvain
847a0ba140 display correct slot status in space reservation calendar 2017-02-27 16:15:27 +01:00
Sylvain
af5f3c777d fix space slot status in API 2017-02-27 13:48:35 +01:00
Sylvain
03d922e214 change DB model to allow many_to_many relationship between Slot and Reservation 2017-02-27 13:15:31 +01:00
Sylvain
8e86c4b212 [ongoing] spaces reservation calendar 2017-02-23 17:45:55 +01:00
Sylvain
c12366c9f1 [bug] unable to see reserved trainings for admin in booking calendar 2017-02-22 17:29:35 +01:00
Sylvain
11619dc6c5 remove reference to machine in cart directive code 2017-02-21 16:41:53 +01:00
Sylvain
5a41424579 fixed & improved js routing 2017-02-21 15:41:45 +01:00
Sylvain
23b9851218 allow enable/disable spaces -> disabled by default 2017-02-15 15:41:25 +01:00
Sylvain
d463d4dd5a display spaces in admin calendar 2017-02-15 13:18:03 +01:00
Sylvain
d8acd4c86f fix ui issues on space creation/deletion 2017-02-14 12:51:30 +01:00
Sylvain
da95e6e0d8 space creation interface 2017-02-14 11:28:07 +01:00
Sylvain
05d4b7b3c5 spaces api 2017-02-13 16:10:12 +01:00
Sylvain
c479502dd0 [bug] too many unread notifications cause system memory overflow 2017-01-05 15:06:54 +01:00
Sylvain
8119f54e4c Statistics about hours available for machine reservations and tickets available for training reservations, now handle custom filtering on date and type 2017-01-03 17:07:23 +01:00
Sylvain
9bfaaaccd9 improved numerous notifications display 2016-12-19 17:08:11 +01:00
Sylvain
102eecdc8a ability to send again auth migration code 2016-12-15 14:16:24 +01:00
Sylvain
76c1412177 Merge branch 'wallet_avoir' into dev 2016-12-13 15:33:56 +01:00
Sylvain
85ee73f0e0 ability to edit coupon expiration 2016-12-13 12:01:54 +01:00
Sylvain
b44089a33d interface & api to build avoir for a wallet credit 2016-12-12 14:20:26 +01:00
Sylvain
4c8b661750 display coupon application result in inline message instead of growl notification 2016-11-30 10:17:05 +01:00
Sylvain
b75cbc17d7 fix training reservation calendar witch shows all trainings slots 2016-11-29 15:48:39 +01:00
Sylvain
82fa5416ce fix creation of prices with float values 2016-11-29 15:23:36 +01:00
Peng DU
f487133825 fix bug: user cant debit his wallet when admin pay a plan for this user with invoice disabled 2016-11-29 11:39:41 +01:00
Sylvain
ff11694e05 check cash coupons does not exceed cart amount for events 2016-11-24 15:01:35 +01:00
Sylvain
04e10c8bb6 check cash coupons does not exceed cart amount for trainings & machines 2016-11-24 13:58:41 +01:00
Sylvain
8419efc7f5 handle unconfigured twitter's keys 2016-11-24 09:38:42 +01:00
Sylvain
c13f640e81 remove rails find_by_* helpers 2016-11-23 16:30:19 +01:00
Sylvain
cc06bcab85 fix cash coupon creation on stripe + store amount in centimes 2016-11-23 15:44:59 +01:00
Sylvain
ad2911529c db model, api and interface for cash coupons 2016-11-23 12:43:42 +01:00