Alex Coelho
5241801a3b
Merge branch 'dev' of github.com:alexcvcoelho/fab-manager
2017-11-15 23:36:43 -02:00
Sylvain
8c156e4830
fix docker-compose deploy instructions
2017-11-15 10:20:23 +01:00
Sylvain
c760a96320
updated changelog with deploy instructions
2017-11-13 13:20:30 +01:00
Sylvain
80ce5c43ea
Merge branch 'dev' for release 2.6.0
2017-11-13 13:17:01 +01:00
Sylvain
dc138c21a8
Version 2.6.0
2017-11-13 13:16:24 +01:00
Sylvain
89d1586e53
update VCR cassette to fix rake test: renew subscription as user
2017-11-13 13:06:57 +01:00
Sylvain
c5b3de9a76
upgrade rails minor version
2017-11-13 12:25:28 +01:00
Sylvain
639610dc7a
[bug] unable to display profiles of users whom any reservation is associated with a deleted object
2017-11-13 11:15:33 +01:00
Clément CHADEYRON
4a3995604c
add spanish translation
...
translation made spain by :
Smart Open Lab
2017-11-06 14:15:22 +01:00
Sylvain
497ad71591
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
2017-11-02 15:34:09 +01:00
Sylvain
73a62bd9a0
[feature] allow setting decimal prices
2017-11-02 15:33:56 +01:00
Sylvain
90fe4e313b
hide reserve button on machine details page is machine is disabled
2017-10-16 14:04:55 +02:00
Sylvain
a4bcad3059
updated changelog
2017-10-11 16:52:46 +02:00
Sylvain
18b8d516ee
Merge branch 'disable' into dev
2017-10-11 16:11:02 +02:00
Sylvain
8acd5eba27
updated changelog
2017-10-11 16:10:18 +02:00
Sylvain
f4fd919dde
display disabled status for machines & trainings in openAPI
2017-10-11 16:03:04 +02:00
Sylvain
cc94a19ba6
hide disabled spaces in admin pricing area
2017-10-11 15:50:18 +02:00
Sylvain
02a155e7af
prevent create availability for disabled space
2017-10-11 15:23:42 +02:00
Sylvain
1631e4ae5c
hide disabled spaces & machines in public calendar
2017-10-11 15:18:44 +02:00
Sylvain
f8f45bcb69
filter and hide disabled spaces in list
2017-10-11 15:15:30 +02:00
Sylvain
1c8d362f11
ability to disable space
2017-10-11 14:58:38 +02:00
Sylvain
02baf9097e
hide disabled machine in admin pricing zone + prevent creating negative credits
2017-10-11 14:48:03 +02:00
Sylvain
ad288628cc
hide disabled trainings in pricing admin zone
2017-10-11 13:09:52 +02:00
Sylvain
0ab01091cd
prevent create availabilities for disabled machines
2017-10-11 13:02:54 +02:00
Sylvain
45465e8b59
prevent associate disabled machines w/ training
2017-10-11 13:00:46 +02:00
Sylvain
c9c7fe00c5
filter disabled machines in list + improve responsiveness
2017-10-11 12:54:13 +02:00
Sylvain
c67360771a
ability to disable machine
2017-10-11 12:10:05 +02:00
Sylvain
5ce6d4486e
fix profile complete mail template for non imported users
2017-10-11 11:56:43 +02:00
Sylvain
41eef71ead
fix c/p issue + prevent link disabled training to user
2017-10-11 11:40:21 +02:00
Sylvain
4d7a317315
prevent create new availability with disabled training
2017-10-10 18:17:22 +02:00
Sylvain
0e38574ef8
hide disabled trainings in public calendar
2017-10-10 18:13:30 +02:00
Sylvain
4752fce762
disable required training modal for machines associated with disabled trainings
2017-10-10 18:12:07 +02:00
Sylvain
4090fe2119
filter trainings list by status
2017-10-10 17:38:01 +02:00
Sylvain
05d9e62dd2
ability to disabled training
2017-10-10 17:16:43 +02:00
Sylvain
14592c1e18
prevent user from switching to disabled group
2017-10-10 16:30:28 +02:00
Sylvain
33b146d243
hide disabled groups
2017-10-10 15:44:17 +02:00
Sylvain
189665e53b
[ongoing] prevent disable group with users + [ongoing] hide disabled groups
2017-10-05 17:54:44 +02:00
Sylvain
fb092afc8c
filter enabled/disabled groups
2017-10-05 17:12:22 +02:00
Sylvain
c5f0501df2
enable/disable group
2017-10-05 16:48:18 +02:00
Sylvain
40bf22279e
add warning on plan disabling
2017-10-05 15:44:06 +02:00
Sylvain
a9cce55855
plan disabling: hide everywhere + filter in admin filter
2017-10-05 15:32:20 +02:00
Sylvain
61c59349cd
updated OpenAPI documentation
2017-10-05 11:33:51 +02:00
Sylvain
26d79e5b12
disable a plan
2017-10-04 18:56:39 +02:00
Sylvain
25eb24e516
Confirmation and error handling while deleting an event
2017-10-02 13:14:15 +02:00
Sylvain
bbae623cac
[bug] image deformed on small device
2017-09-26 16:32:55 +02:00
Sylvain
601ac177b6
[bug] rendering for social networks shares
2017-09-26 15:48:47 +02:00
Sylvain
dbff2d1745
events list: change buttons to anchors to allow opening in background tab
2017-09-26 09:44:55 +02:00
Sylvain
ce0887e2ec
add missing jsdoc
2017-09-25 15:58:45 +02:00
Sylvain
f874748f74
[bug] fix events monitoring pagination
2017-09-25 15:48:21 +02:00
siteswapjuggler
70cf6ebfa8
cancel and sold out badge in event list
...
Public event list prompte cancelled and sold out badge for more clarity
to the public users.
Correction for « sold_out » test in home, show and public list. 0
subscriber with 0 free_place should be a free entry case and it appears
to be sold out.
Another error occurs (negative free place) if an admin change the
number of free places or decide to go free entry with an event.
Home and public list better display with access and price separate.
2017-09-24 21:51:58 +02:00