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
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
54d686f1ac
[bug] home events overflow
2017-09-11 14:10:52 +02:00
siteswapjuggler
52071c7b83
Merge remote-tracking branch 'LaCasemate/master'
2017-09-10 12:01:59 +02:00
Sylvain
f5e2a44dcf
[bug] in public calendar, availabilities are not shown to visitors
2017-09-07 11:44:50 +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
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
295dc3749b
[bug] filename too long on events&prices API + updated axlsx
2017-08-16 12:05:04 +02:00
Sylvain
00d157dc3b
[bug] filename too long error on GET api/groups
2017-07-26 10:15:47 +02:00
Sylvain
3e44d62aac
[bug] filename too long error on GET api/trainings
2017-07-18 10:55:41 +02:00
Sylvain
17544225b5
[bug] invoices generation failed for subscription days offered
2017-07-12 11:38:51 +02:00
Sylvain
42d2c2ee31
[bug] hide spaces in public calendar when disabled
2017-06-13 19:31:48 +02:00
Sylvain
7ff46db808
[bug] confirmation message after admin creation
2017-06-13 19:26:32 +02:00
Peng DU
2ff47f3204
add task Id: 3713, reference: 1706002/VL, stripe id: in_1ASRQy2sOmf47Nz9Xpxtw46A, invoice total: 30.0, stripe invoice total: 80.0, date: 2017-06-08 16:16:26 +0200
...
Id: 3716, reference: 1706005/VL, stripe id: in_1ASRye2sOmf47Nz9utkjPDve, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:51:15 +0200
Id: 3717, reference: 1706006/VL, stripe id: in_1ASS1X2sOmf47Nz93Xn2UxVh, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 16:54:14 +0200
Id: 3718, reference: 1706007/VL, stripe id: in_1ASSBI2sOmf47Nz9Ol0gEEfC, invoice total: 30.0, stripe invoice total: 40.0, date: 2017-06-08 17:04:19 +0200 allow find the invoices incoherent
2017-06-09 11:08:08 +02:00
Peng DU
c6fedf3f20
Merge branch 'fix_issus_77' into dev
2017-06-08 19:40:30 +02:00
Peng DU
eca141f902
fix bug #77 : reservation amount total isnt equal stripe invoice amount that be paid by client
2017-06-08 19:38:19 +02:00
Sylvain
8531168ba2
improve RSS with project author and image + event dates image and category
2017-05-17 12:18:20 +02:00
Sylvain
7960964aed
set organization name in invoice object, if any ( #64 )
2017-05-16 10:44:52 +02:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02:00
Sylvain
b403f86187
[bug] price init for new groups & delete group
2017-05-15 15:25:27 +02:00
Sylvain
89e30980e0
[bug] unable to set locale other than fr or en
2017-04-27 18:35:00 +02:00
cyril
d1a1b63db5
Project view: added responsive support on external images
2017-04-13 14:26:29 +02:00
cyril
3fcf61de24
hide spaces in admin's credit management if spaces are disabled
2017-03-28 20:13:18 +02:00
Peng DU
1d53e3b5b7
fix json template of training reservation
2017-03-28 19:53:48 +02:00
Peng DU
2cc8096236
fix bug: cant get list of training reservation
2017-03-28 19:45:36 +02:00
Sylvain
ff8e804750
Merge branch 'week' into dev
2017-03-21 15:51:52 +01:00
Sylvain
f4187d0b4b
[bug] news plans statistics are not shown
2017-03-21 15:47:25 +01:00
Sylvain
5abc85ae0a
[feature] weekly plans
2017-03-21 13:06:02 +01:00
Sylvain
21560dd5d9
show space details on image-click
2017-03-21 12:06:58 +01:00
Sylvain
2c1b65eab9
Merge branch 'hotfix' into dev
2017-03-15 13:07:28 +01:00
Sylvain
8d5966396d
[bug] editing a plan remove the rolling attribute
2017-03-15 12:50:19 +01: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
0f6358011f
improved space explications style
2017-03-02 17:04:47 +01:00
Sylvain
20ccc809aa
prevent polling notifications when the page is in background
2017-03-02 16:50:02 +01:00
Sylvain
853a3160d3
add notice about availabilities export
2017-03-02 13:39:49 +01:00
Sylvain
d8b8c39cb3
add day of week to availabilities export
2017-03-02 13:31:12 +01:00
Sylvain
c21f7ed5dc
export events availabilities
2017-03-02 13:05:29 +01:00
Sylvain
056060a88d
export spaces availabilities
2017-03-02 12:57:07 +01:00
Sylvain
d9b30fa2b0
export trainings availabilities
2017-03-02 12:44:59 +01:00
Sylvain
504fe49964
export machines availabilities
2017-03-02 12:34:28 +01:00
Sylvain
4d09ed37a3
export machines availabilities
2017-03-02 12:34:16 +01:00
Sylvain
f5ac9b1913
[bug] month navigation in client calendar ( #59 )
2017-03-01 17:23:46 +01:00
Sylvain
b9dcf5a512
[bug] delete event with custom price ( #61 )
2017-03-01 17:09:37 +01:00
Sylvain
2e094a501f
init spaces prices on plan creation
2017-03-01 16:45:05 +01:00
Sylvain
6df0a4090e
hide spaces in admin's price management and in plan edition if spaces are disabled
2017-03-01 15:58:40 +01:00
Sylvain
7ba50a72b7
reorganize spaces menu entries
2017-03-01 15:51:13 +01:00
Sylvain
13689fd707
set spaces disabled by default
2017-03-01 15:50:49 +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
3c6bcccd0d
reset reservation modification on user change
2017-03-01 14:38:29 +01:00
Sylvain
30c6954464
prevent modify reservation to a complete slot
2017-03-01 14:35:07 +01:00
Sylvain
c9d6df13f9
disable space projects
2017-03-01 14:30:53 +01:00
Sylvain
185084f244
prevent admin from creating space availabilities that are not multiples of 1h
2017-03-01 14:27:01 +01:00
Sylvain
cdefcebf4c
fix typo
2017-03-01 12:59:59 +01:00
Sylvain
cf9181770b
export space statistics
2017-03-01 12:56:11 +01:00
Sylvain
05bf899393
delete old space stats when regenerating
2017-03-01 11:58:11 +01:00
Sylvain
b48451f9f8
improved space reservation optional explication message
2017-03-01 11:47:20 +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
e1178df45b
show space details on click in client calendar
2017-02-28 16:59:28 +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
4703350de5
fix pay with stripe and coupon
2017-02-28 10:18:02 +01:00
Sylvain
b48557fd96
invoice generation for space reservation
2017-02-27 17:42:36 +01:00
Sylvain
43f78ff0e0
fix credits usage in space reservation
2017-02-27 17:38:15 +01:00
Sylvain
31f3c00b3a
fix pay many space slots by stripe
2017-02-27 16:51:11 +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
fd2d18bf94
fix message on delete availability error
2017-02-27 10:14:19 +01:00
Sylvain
8e86c4b212
[ongoing] spaces reservation calendar
2017-02-23 17:45:55 +01:00
Sylvain
1efd506a5d
fix display in all trainings calendar
2017-02-23 13:50:45 +01:00
