Sylvain
6637832d00
refactored frontend invoices translations
2019-01-03 17:39:50 +01:00
Sylvain
bd6584f529
code improvement
2019-01-03 16:50:50 +01:00
Sylvain
105bcf6236
[ongoing] interface to close an accounting period
2019-01-03 16:48:52 +01:00
Sylvain
ea0ec47268
[bug] error handling does not work in some cases
2019-01-03 12:22:34 +01:00
Sylvain
39ab5a7ba9
[bug] unable to fetch projects from OpenProjects ( #126 )
2019-01-02 13:53:27 +01:00
Sylvain
10e3d4c3e4
fix update setting from client
2018-12-27 14:15:58 +01:00
Sylvain
5828513a3a
handle error while polling notifications fails
2018-11-27 16:51:30 +01:00
Sylvain
f6cd552c66
migrate to angular 1.6
2018-11-27 16:26:21 +01:00
Sylvain
ab334d504b
migrate to angular 1.5
2018-11-27 15:16:23 +01:00
Sylvain
ad3105cbc9
migrate to angular 1.4
2018-11-27 13:57:41 +01:00
Sylvain
0c63405b4d
migrate from bower to yarn
2018-11-22 17:09:33 +01:00
Sylvain
2801ab0039
fix controllers imports issues due es6 convertion
2018-11-21 15:29:35 +01:00
Sylvain
6e56ac4286
javascript fixes
2018-11-21 11:32:50 +01:00
Sylvain
f528b2021d
added semicolons
2018-11-21 11:08:53 +01:00
Sylvain
8cd533b5a6
eslint problems autofixes
2018-11-21 10:59:07 +01:00
Sylvain
d250dfa1d3
convert coffeescript comments to valid jsdoc
2018-11-21 09:42:31 +01:00
Sylvain
8a03b0b4f2
fix events page + fix disableAnimation directive
2018-11-20 16:25:15 +01:00
Sylvain
c1b1b701ae
fixes and improvements after coffeescript migration
2018-11-20 14:44:41 +01:00
Sylvain
bf1a3ce913
fix ERB JS services
2018-11-20 13:46:28 +01:00
Sylvain
0814f8c2fa
fix ERB JS directives
2018-11-20 13:44:53 +01:00
Sylvain
cfedb643b5
fix angular router file
2018-11-20 12:57:10 +01:00
Sylvain
74b6afd166
fix ERB JS controllers
2018-11-20 12:26:06 +01:00
Sylvain
aac0e8125c
[ongoing] fix erb js controllers
2018-11-19 16:52:48 +01:00
Sylvain
185ea30db3
Merge branch 'erb' into es6
2018-11-19 16:20:46 +01:00
Sylvain
6352087f70
fix comments in erb files
2018-11-19 16:17:49 +01:00
Sylvain
12f74d5d08
fixed javascript for events controllers
2018-11-07 16:37:28 +01:00
Sylvain
39b18933b6
fixed javascript for application controller
2018-11-07 16:36:10 +01:00
Sylvain
e7031c90d5
restablished erb files
2018-10-25 17:08:13 +02:00
decaffeinate
5da4bf6317
decaffeinate: Run post-processing cleanups on about.coffee and 95 other files
2018-10-25 16:51:20 +02:00
decaffeinate
2c4dd31869
decaffeinate: Convert about.coffee and 95 other files to JS
2018-10-25 16:50:16 +02:00
decaffeinate
c4a2635cd9
decaffeinate: Rename about.coffee and 95 other files from .coffee to .js
2018-10-25 16:49:04 +02:00
Sylvain
944fa5f9b9
fixed erb syntax for decaffeinate
2018-10-25 13:10:39 +02:00
Sylvain
41847d75a2
removed erb suffixes
2018-10-25 13:06:09 +02:00
Sylvain
8d4b354199
[bug] change group button overflow
2018-10-15 16:51:44 +02:00
Sylvain
1e3066f6f4
Ability to parametrize machines order on the booking page
2018-09-18 15:30:54 +02:00
Sylvain
1b33f3c865
display the machine reservation user name to other members
2018-07-24 12:24:51 +02:00
Sylvain
05bd65dfb2
migrate es api: top 10 aggregations
2018-07-12 11:26:13 +02:00
Sylvain
17b7e96b67
[ongoing] fix top 10 aggregation
2018-06-12 12:59:23 +02:00
Sylvain
38551e8ac2
[ongoing] migrate es api: graphs (see FIXME)
2018-06-08 17:22:03 +02:00
Sylvain
f66ca9165e
migrate es api: statistics
2018-06-08 12:27:11 +02:00
Sylvain
697ea87e37
[bug] unable to filter statistics from age 0
2018-06-08 12:06:22 +02:00
Nicolas Florentin
a29ba926c0
fix events/index order, frontend js code was conflicting with server-side behaviour
2017-12-18 16:15:38 +01:00
Nicolas Florentin
2f4dd4642a
adds polyfill for Object.assign, fix for IE11
2017-12-18 14:54:46 +01:00
Sylvain
e091b81187
fix events pagination
2017-12-13 15:20:51 +01:00
Sylvain
12c6cd2a70
Merge branch 'siteswapjuggler-master' into dev
...
also: align translations and mark missings
2017-11-20 11:43:40 +01: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
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
c9c7fe00c5
filter disabled machines in list + improve responsiveness
2017-10-11 12:54:13 +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
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
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
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
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
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
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
cf6afb817d
[feature] configuration of max visibility for reservations
2017-08-24 18:34:18 +02:00
Sylvain
7ff46db808
[bug] confirmation message after admin creation
2017-06-13 19:26:32 +02:00
Sylvain
54154b1713
[feature] ability for admins to create users or organizations
2017-05-16 10:23:25 +02: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
796f0a87ae
ability to remove an unused custom price for an event ( #61 )
2017-03-02 18:36:54 +01:00
Sylvain
20ccc809aa
prevent polling notifications when the page is in background
2017-03-02 16:50:02 +01:00
Sylvain
504fe49964
export machines availabilities
2017-03-02 12:34:28 +01:00
Sylvain
f5ac9b1913
[bug] month navigation in client calendar ( #59 )
2017-03-01 17:23:46 +01:00
Sylvain
7ba50a72b7
reorganize spaces menu entries
2017-03-01 15:51:13 +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
185084f244
prevent admin from creating space availabilities that are not multiples of 1h
2017-03-01 14:27:01 +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
a0e7e7951f
[ongoing] display spaces in public calendar
2017-02-28 11:59:48 +01:00
Sylvain
31f3c00b3a
fix pay many space slots by stripe
2017-02-27 16:51:11 +01:00
Sylvain
6a132948af
fixed slots display in space reservation calendar
2017-02-27 16:35:41 +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
Sylvain
59384698f7
clean controllers imports
2017-02-23 13:46:16 +01:00
Sylvain
b25e69d131
fix do not subscribe
2017-02-23 12:50:12 +01:00
Sylvain
201eefc7bd
fix reservation through all trainings calendar
2017-02-23 12:39:50 +01:00
Sylvain
b098281155
fix reservation through all trainings calendar
2017-02-23 12:23:00 +01:00
Sylvain
ad83d38305
prevent book full event
2017-02-23 11:24:44 +01:00
Sylvain
03758d336c
fix move & cancel training reservation + fix display after cancel for machines & training
2017-02-22 17:45:22 +01:00
Sylvain
40ec38465c
fix display: after event move, starting a new move does not reset the previous move summary
2017-02-22 17:31:02 +01:00
Sylvain
c12366c9f1
[bug] unable to see reserved trainings for admin in booking calendar
2017-02-22 17:29:35 +01:00
Sylvain
1959856235
use the cart directive in training reservation
2017-02-22 16:45:13 +01:00
Sylvain
dbc5d8836d
ability to add only one item in the cart
2017-02-22 14:41:49 +01:00
Sylvain
3e49c35414
improved comments
2017-02-22 13:50:13 +01:00
Sylvain
c2c400107d
improved tag management in cart
2017-02-22 11:23:32 +01:00
Sylvain
4bb9728502
clean machines controller
2017-02-22 11:01:52 +01:00
Sylvain
c4824f99ba
fix summary after event moved
2017-02-22 10:28:14 +01:00
Sylvain
7a21a907a8
offer slot from cart + [ongoing] refacto cart translations
2017-02-22 09:44:15 +01:00
Sylvain
86371a42df
fix display alter when exchanging events if tag missmatch
2017-02-21 17:44:27 +01:00
Sylvain
9b2ba8528f
fix machines controller JSDoc
2017-02-21 17:43:39 +01:00
Sylvain
76478bc075
display reservable name in summary after payment
2017-02-21 17:26:54 +01:00
Sylvain
4fa171da9d
display summary after payment + ongoing clean template from references to machine
2017-02-21 17:23:53 +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
3837604dd6
fix remove slot from cart
2017-02-21 15:26:11 +01:00
Sylvain
fe6f85eb7c
fix after payment update calendar
2017-02-21 14:48:59 +01:00
Sylvain
3db55019c9
split calendar & cart logic for machines
2017-02-21 13:42:12 +01:00
Sylvain
85572a03db
[ongoing] move payment to cart component
2017-02-20 17:17:27 +01:00
Sylvain
9b7f74e02d
handle coupons & plans & user change in cart directive
2017-02-20 15:07:14 +01:00
Sylvain
049606b450
[ongoing] reservation cart refactoring
2017-02-16 17:57:14 +01:00
Sylvain
f850c66f01
prevent add space availability if disabled
2017-02-15 16:58:17 +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
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
d8acd4c86f
fix ui issues on space creation/deletion
2017-02-14 12:51:30 +01:00
Sylvain
73a5689140
inteface to display spaces
2017-02-14 12:41:51 +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
40952600e7
basic interface structure for space management
2017-02-13 17:00:27 +01:00
Sylvain
ab53b621d1
[bug] navigation to about page duplicates admin's links in left menu
2017-01-05 18:03:54 +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
94abdb9eec
revert last commit
2017-01-02 17:01:52 +01:00
Sylvain
a39be14718
fix number of remaining notifications
2017-01-02 15:56:52 +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
5e1b85832c
[ongoing] resend sso fusion token
2016-12-14 17:14:53 +01:00
Sylvain
76c1412177
Merge branch 'wallet_avoir' into dev
2016-12-13 15:33:56 +01:00
Sylvain
ecbe8a58a2
coupon edition: display internationalized errors
2016-12-13 12:46:00 +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
c2f638934e
added info notice about operation's time of admin delete
2016-12-12 11:18:24 +01:00
Sylvain
4c8b661750
display coupon application result in inline message instead of growl notification
2016-11-30 10:17:05 +01:00
Sylvain
10fc7b69e9
Ability to display optional information message on event reservation page
2016-11-29 16:46:19 +01:00
Sylvain
852437ebf8
remove coupon from memory after payment
2016-11-29 15:35:54 +01:00
Sylvain
0c05b45d08
improved error message on machine reservation w/ stripe payment
2016-11-29 09:15:30 +01:00
Sylvain
70a369a2b9
display error message on server error when paying by card
2016-11-28 16:47:40 +01:00
Sylvain
3ce41f0c5c
[to test] send cash coupon to user by mail
2016-11-24 18:17:49 +01:00
Sylvain
ce6877b484
success message when applying cash coupon
2016-11-24 18:05:16 +01:00
Sylvain
0a08c4c32d
check cash coupons does not exceed cart amount for subscriptions
2016-11-24 16:38:22 +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
3dc5f1a0e4
real fix for coupon change slot's original price (reverts cfd92cdc40
)
2016-11-24 11:33:45 +01:00
Sylvain
30ab25b5a0
normalize ProjectsController code structure
2016-11-23 15:01:33 +01:00
Sylvain
cf11f6afcf
factorize currency symbol into
2016-11-23 14:27:11 +01:00
Sylvain
ad2911529c
db model, api and interface for cash coupons
2016-11-23 12:43:42 +01:00
Sylvain
6c9fdaaf83
[bug] fix machine hours stats graph
2016-11-21 11:35:56 +01:00
Sylvain
73e4439036
front-end modifications to cancel a booked event
2016-11-09 17:07:48 +01:00
Peng DU
ba5e5752a4
allow add more picture for project step
2016-11-02 14:58:06 +01:00
Sylvain
91f70e2c47
[bug] statistics graphs not working
2016-10-24 09:31:29 +02:00
Sylvain
7d54341d98
Merge remote-tracking branch 'github/master' into dev
2016-10-11 15:37:35 +02:00
Kenneth Lim
18bc37749b
locale: informations --> information
...
Not sure if this helps but information does not require an `s`. :)
Signed-off-by: Kenneth Lim <kennethlimcp@gmail.com>
2016-10-07 17:11:58 +08:00
Sylvain
611652ccb5
[bug] many fixes on admin calendar
...
- [bug] after creating an element (training/machine), browse through the calendar and come back: the element appears duplicated
- [bug] deleting an element have an erronous confirmation message
- [bug] deleting an element cause the message "cannot read property 'length' of undefined" to be displayed in the console
2016-10-05 11:06:58 +02:00
Sylvain
c2d2786515
fix default_host for dev and test environments
2016-09-29 10:02:31 +02:00
Sylvain
785e9a42f8
test fix asset:precompile
2016-09-28 10:52:25 +02:00
Sylvain
e48bb88f1f
use slug in traning show url
2016-09-27 16:00:22 +02:00
Sylvain
b715078e83
[admin] button to delete training from view + confirmation on machine/training deletion from view
2016-09-27 15:32:49 +02:00
Sylvain
9a71dc5ea2
trainings monitoring: open current year/month by default on training selection
2016-09-27 14:56:57 +02:00
Sylvain
36524d4cd9
display list of allowed extensions in project's CAD attachments
2016-09-27 14:08:04 +02:00
Sylvain
6e94850522
prevent project step reordering to trigger unsaved-changes dialog
2016-09-27 11:31:20 +02:00
Sylvain
1195451863
[bug] embedded video not working in tranings/machines descriptions
2016-09-27 10:45:07 +02:00
Sylvain
30c52dfe95
share on twitter with title
2016-09-26 16:44:45 +02:00
Sylvain
205c45060a
update version on user login according to their role
2016-09-22 17:01:40 +02:00
Sylvain
6401b321ef
[feature] display fab-manager's version, when logged as admin
2016-09-22 16:46:14 +02:00
Peng DU
1008a6dd1b
fix bug: cant show correct payment modal when pay by wallet and code promo
2016-09-21 13:09:10 +02:00
Peng DU
cfd92cdc40
fix bug: code promotion change slot's price original
2016-09-20 18:39:28 +02:00
Peng DU
e5341b0b89
fix bug: cant subscribe a plan
2016-09-20 14:37:35 +02:00
Sylvain
64bae54bce
[Bug] move event reservation is not limited by admin settings (prior-delay & disable)
2016-09-15 18:43:27 +02:00
Sylvain
3c277428bf
[SSO] field data mapping transformation on data reception
2016-09-15 17:10:41 +02:00
Sylvain
13f416a101
[sso] save and restore field data mapping
2016-09-15 15:58:21 +02:00
Sylvain
77626aa674
[SSO] interface for transforming boolean and dates datatypes
2016-09-14 18:52:18 +02:00
Sylvain
a0fb6fb683
[sso] show mapping datatype in provider edition
2016-09-14 17:32:11 +02:00
Sylvain
dc4c4b678f
[sso] fix create mapping w/ datatype display
2016-09-14 17:13:07 +02:00
Sylvain
50543b8d09
[sso] give informations about the expected data in sso mapping
2016-09-14 16:41:45 +02:00
Sylvain
019cfcadea
[sso] fix endpoint regexp
2016-09-13 12:09:55 +02:00
Sylvain
c2533c0590
add custom aggs for machine & trainings stats: available bookings
2016-09-06 17:17:15 +02:00
Sylvain
9d599a14e5
display custom aggregations in front statistics
2016-09-06 16:53:04 +02:00
Sylvain
53dd54b175
working custom aggs w/ result tidy in stats query
2016-09-06 16:32:41 +02:00