Sylvain
|
12c6cd2a70
|
Merge branch 'siteswapjuggler-master' into dev
also: align translations and mark missings
|
2017-11-20 11:43:40 +01:00 |
|
Sylvain
|
02baf9097e
|
hide disabled machine in admin pricing zone + prevent creating negative credits
|
2017-10-11 14:48:03 +02:00 |
|
Sylvain
|
4090fe2119
|
filter trainings list by status
|
2017-10-10 17:38:01 +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
|
a9cce55855
|
plan disabling: hide everywhere + filter in admin filter
|
2017-10-05 15:32:20 +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
|
03b5b8bfae
|
fix typo in FR
|
2017-09-18 11:00:42 +02:00 |
|
siteswapjuggler
|
52071c7b83
|
Merge remote-tracking branch 'LaCasemate/master'
|
2017-09-10 12:01:59 +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
|
d092a1c5ea
|
admin can lock and unlock availbilities
|
2017-09-06 15:01:41 +02:00 |
|
siteswapjuggler
|
e13817176f
|
event monitor improvement
Many imrovement for the event monitoring admin module.
|
2017-09-04 00:09:08 +02:00 |
|
Sylvain
|
9c6143bd5e
|
tooltip about images insertion in medium editor
|
2017-08-29 17:50:57 +02:00 |
|
Sylvain
|
cf6afb817d
|
[feature] configuration of max visibility for reservations
|
2017-08-24 18:34:18 +02:00 |
|
Sylvain
|
54154b1713
|
[feature] ability for admins to create users or organizations
|
2017-05-16 10:23:25 +02:00 |
|
Sylvain
|
853a3160d3
|
add notice about availabilities export
|
2017-03-02 13:39:49 +01:00 |
|
Sylvain
|
504fe49964
|
export machines availabilities
|
2017-03-02 12:34:28 +01:00 |
|
Sylvain
|
1503e9b83f
|
fix typo
|
2017-03-01 14:20:50 +01:00 |
|
Sylvain
|
b48451f9f8
|
improved space reservation optional explication message
|
2017-03-01 11:47:20 +01:00 |
|
Sylvain
|
d463d4dd5a
|
display spaces in admin calendar
|
2017-02-15 13:18:03 +01:00 |
|
Sylvain
|
1855935322
|
interface to create space availabilities
|
2017-02-15 11:32:29 +01:00 |
|
Sylvain
|
30454c4262
|
manage space info message + refactor settings translations mapping
|
2017-02-15 09:48:27 +01:00 |
|
Sylvain
|
36a0eafef3
|
interface to set credits for spaces
|
2017-02-14 17:29:52 +01:00 |
|
Sylvain
|
ec4a06a0e4
|
interface to configure space price per plan + refactored plans interface code
|
2017-02-14 17:06:42 +01:00 |
|
Sylvain
|
1554cfe65d
|
refactor plan translations mapping
|
2017-02-14 16:09:07 +01:00 |
|
Sylvain
|
93bceb5517
|
define spaces prices for non-subscribers
|
2017-02-14 15:25:28 +01:00 |
|
Sylvain
|
334201e551
|
refactor admin pricing translations mapping
|
2017-02-14 14:58:16 +01:00 |
|
Sylvain
|
0adb9e29c6
|
space edition interface
|
2017-02-14 13:36:10 +01:00 |
|
Sylvain
|
da95e6e0d8
|
space creation interface
|
2017-02-14 11:28:07 +01:00 |
|
Sylvain
|
9d367f95db
|
[ongoing] new space interface
|
2017-02-13 17:18:06 +01:00 |
|
Sylvain
|
c2f638934e
|
added info notice about operation's time of admin delete
|
2016-12-12 11:18:24 +01:00 |
|
Sylvain
|
10fc7b69e9
|
Ability to display optional information message on event reservation page
|
2016-11-29 16:46:19 +01:00 |
|
Sylvain
|
ad2911529c
|
db model, api and interface for cash coupons
|
2016-11-23 12:43:42 +01:00 |
|
Sylvain
|
c04ed51f85
|
[bug] translation conflict
|
2016-11-09 14:35:02 +01:00 |
|
Sylvain
|
ec0f597067
|
[sso] display strategy name in providers list
|
2016-09-13 12:06:25 +02:00 |
|
Sylvain
|
c2533c0590
|
add custom aggs for machine & trainings stats: available bookings
|
2016-09-06 17:17:15 +02:00 |
|
Sylvain
|
71a111d8ba
|
improved reservations settings validation (delays)
|
2016-09-01 16:15:41 +02:00 |
|
Sylvain
|
4f41aa6554
|
event custom prices: various fixes and removed artifacts
|
2016-08-30 13:07:47 +02:00 |
|
Sylvain
|
3d1c852576
|
show custom prices bookings in admin/editMember
|
2016-08-29 16:54:10 +02:00 |
|
Sylvain
|
bca77559ed
|
ability to delete a price category
|
2016-08-24 17:09:00 +02:00 |
|
Sylvain
|
77db2b2326
|
ability to edit price category
|
2016-08-24 16:52:37 +02:00 |
|
Sylvain
|
500a466371
|
full ability to create price categories
|
2016-08-24 16:21:43 +02:00 |
|
Sylvain
|
6c3dfab0a9
|
API for price categories management
|
2016-08-24 12:30:48 +02:00 |
|
Sylvain
|
9748ea596f
|
interface structure refactoring for fares' categories
|
2016-08-23 17:49:43 +02:00 |
|
Sylvain
|
26aed7a1b5
|
ability for the admin to set custom settings for the reservation reminders + fix settings customization confirmation message
|
2016-08-17 12:49:52 +02:00 |
|
Sylvain
|
428b2db0ea
|
send a coupon to a user
|
2016-08-16 18:12:13 +02:00 |
|
Sylvain
|
3253290860
|
[ongoing] send a coupon to a user
|
2016-08-16 11:33:10 +02:00 |
|