Sylvain
|
75310d599f
|
Merge branch 'host' into dev
|
2019-03-26 14:33:30 +01:00 |
|
Sylvain
|
01ac73a1a1
|
removed capistrano & unicorn + cleaned lacasemate brading
|
2019-03-26 10:40:58 +01:00 |
|
Sylvain
|
2ac0336adb
|
Merge branch 'dev' into host
|
2019-03-25 16:17:23 +01:00 |
|
Sylvain
|
5cdaa014ef
|
[security] updated devise + updated rails
|
2019-03-25 14:57:48 +01:00 |
|
Sylvain
|
8530a6f655
|
superadmin + fixed free space notification
|
2019-03-20 16:49:38 +01:00 |
|
Sylvain
|
03c0c0d4fb
|
close periods at 1 year minus 1 day + fix alert reminder transalation
|
2019-03-18 14:45:21 +01:00 |
|
Sylvain
|
7b0824a4a3
|
notify admins when no accounting period closed for 1 year
|
2019-03-18 14:33:30 +01:00 |
|
Sylvain
|
4f418cc3fb
|
compute total without taxes + fix close period date pickers + improved archived % number format
|
2019-03-12 13:36:10 +01:00 |
|
Sylvain
|
b9e427a9fc
|
include VAT in archives
|
2019-03-12 12:15:14 +01:00 |
|
Sylvain
|
2a32bc4752
|
date the archives
|
2019-03-11 16:25:51 +01:00 |
|
Sylvain
|
b940ae0327
|
display complete info set on accounting archives
|
2019-03-11 16:11:49 +01:00 |
|
Sylvain
|
9854a4b965
|
prevent memory saturation with periodic checks
|
2019-02-26 15:18:19 +01:00 |
|
Sylvain
|
f11f629bcf
|
compute, secure and archive period total and cumulative total of each accounting period
|
2019-02-25 14:51:19 +01:00 |
|
Sylvain
|
cf23fae73c
|
Merge branch 'dev' into host
|
2019-02-14 16:35:38 +01:00 |
|
Sylvain
|
7b573dd37f
|
restored deprecated notification
|
2019-02-14 13:05:09 +01:00 |
|
Sylvain
|
2ba3890325
|
display records integrity status
|
2019-02-12 16:00:36 +01:00 |
|
Sylvain
|
f9364b3872
|
chains invoice and invoiceItem records. save them in archives
|
2019-02-12 14:45:21 +01:00 |
|
Sylvain
|
6e274afe3b
|
accounting archive: insert code checksum and previous archive checksum
|
2019-01-31 12:19:50 +01:00 |
|
Sylvain
|
da672ea8b6
|
Merge branch 'dev' into host
|
2019-01-21 16:34:06 +01:00 |
|
Sylvain
|
75eaf4d4d0
|
improved member autocompletion with multiple words + refactored members controller
|
2019-01-21 15:17:56 +01:00 |
|
Sylvain
|
d2c4773ac9
|
[bug] unable to delete an admin who has changed a setting
|
2019-01-16 17:09:27 +01:00 |
|
Sylvain
|
eb69822ce0
|
Merge branch 'dev' into host
|
2019-01-14 15:00:55 +01:00 |
|
Sylvain
|
77797db2f1
|
display VAT rates history
|
2019-01-14 15:00:33 +01:00 |
|
Sylvain
|
a1ba272538
|
Merge branch 'dev' into host
|
2019-01-14 13:00:24 +01:00 |
|
Sylvain
|
f6e236aeb5
|
refactored roles methods to match ruby conventions
|
2019-01-14 12:57:31 +01:00 |
|
Sylvain
|
a2eb10331e
|
[ongoing] remove invoicing disabled per user
|
2019-01-10 16:50:54 +01:00 |
|
Sylvain
|
4b5bd74188
|
add invoice_items in accounting archive
|
2019-01-10 13:05:57 +01:00 |
|
Sylvain
|
b42d1614fd
|
export to flat json files closed periods
|
2019-01-10 10:52:29 +01:00 |
|
Sylvain
|
5e8172af35
|
Merge branch 'dev' into us78
|
2019-01-09 16:28:36 +01:00 |
|
Sylvain
|
5ab0333176
|
rubocop invoice & avoir
|
2019-01-09 16:28:23 +01:00 |
|
Sylvain
|
d8c8e4f72f
|
set default dates in close modal pickers
|
2019-01-07 17:21:32 +01:00 |
|
Sylvain
|
5b13c59496
|
list existing closings in close period modal
|
2019-01-07 16:45:31 +01:00 |
|
Sylvain
|
d89f9e9301
|
close an accounting period from interface to db through api
|
2019-01-07 15:33:09 +01:00 |
|
Sylvain
|
f2eaf4e4e1
|
improved tests and bug fixes
|
2018-12-11 17:27:25 +01:00 |
|
Sylvain
|
6794b12555
|
force gawk during elastic upgrade & rubocop
|
2018-12-03 15:10:04 +01:00 |
|
Sylvain
|
9af1e5c658
|
fixed User.to_json
|
2018-07-24 11:13:05 +02:00 |
|
Sylvain
|
7afe62522f
|
refactor User.as_json to use jbuilder template
|
2018-07-04 14:05:44 +02:00 |
|
Sylvain
|
679ccfec99
|
ability to share trainings on social medias
|
2018-01-09 15:09:48 +01:00 |
|
Sylvain
|
290b2ad513
|
[bug] facebook sharing of event has HTML tags in description
|
2018-01-09 15:02:45 +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
|
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 |
|
Sylvain
|
f4fd919dde
|
display disabled status for machines & trainings in openAPI
|
2017-10-11 16:03:04 +02:00 |
|
Sylvain
|
1c8d362f11
|
ability to disable space
|
2017-10-11 14:58:38 +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
|
4752fce762
|
disable required training modal for machines associated with disabled trainings
|
2017-10-10 18:12:07 +02:00 |
|
Sylvain
|
05d9e62dd2
|
ability to disabled training
|
2017-10-10 17:16:43 +02:00 |
|
Sylvain
|
189665e53b
|
[ongoing] prevent disable group with users + [ongoing] hide disabled groups
|
2017-10-05 17:54:44 +02:00 |
|
Sylvain
|
c5f0501df2
|
enable/disable group
|
2017-10-05 16:48:18 +02:00 |
|
Sylvain
|
26d79e5b12
|
disable a plan
|
2017-10-04 18:56:39 +02:00 |
|
Sylvain
|
601ac177b6
|
[bug] rendering for social networks shares
|
2017-09-26 15:48:47 +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
|
52071c7b83
|
Merge remote-tracking branch 'LaCasemate/master'
|
2017-09-10 12:01:59 +02:00 |
|
Sylvain
|
d092a1c5ea
|
admin can lock and unlock availbilities
|
2017-09-06 15:01:41 +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
|
dcf55d8351
|
[bug] invalid notification text when sending amount coupon
|
2017-08-29 16:10:16 +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
|
8531168ba2
|
improve RSS with project author and image + event dates image and category
|
2017-05-17 12:18:20 +02:00 |
|
Sylvain
|
89e30980e0
|
[bug] unable to set locale other than fr or en
|
2017-04-27 18:35:00 +02:00 |
|
Peng DU
|
1d53e3b5b7
|
fix json template of training reservation
|
2017-03-28 19:53:48 +02: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
|
13689fd707
|
set spaces disabled by default
|
2017-03-01 15:50:49 +01:00 |
|
Sylvain
|
c9d6df13f9
|
disable space projects
|
2017-03-01 14:30:53 +01:00 |
|
Sylvain
|
cdefcebf4c
|
fix typo
|
2017-03-01 12:59:59 +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
|
847a0ba140
|
display correct slot status in space reservation calendar
|
2017-02-27 16:15:27 +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
|
8ea611882b
|
fix training reservation
|
2017-02-23 11:13:25 +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
|
1959856235
|
use the cart directive in training reservation
|
2017-02-22 16:45:13 +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
|
1855935322
|
interface to create space availabilities
|
2017-02-15 11:32:29 +01:00 |
|
Sylvain
|
0adb9e29c6
|
space edition interface
|
2017-02-14 13:36:10 +01:00 |
|
Sylvain
|
73a5689140
|
inteface to display spaces
|
2017-02-14 12:41:51 +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
|
a7fdc4d741
|
fix potentital issue with sso + enterprise profile
|
2016-12-14 15:55:12 +01:00 |
|
Sylvain
|
3ce41f0c5c
|
[to test] send cash coupon to user by mail
|
2016-11-24 18:17:49 +01:00 |
|
Sylvain
|
0a08c4c32d
|
check cash coupons does not exceed cart amount for subscriptions
|
2016-11-24 16:38:22 +01:00 |
|
Sylvain
|
04e10c8bb6
|
check cash coupons does not exceed cart amount for trainings & machines
|
2016-11-24 13:58:41 +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 |
|
Sylvain
|
d46e6cf9c9
|
[members excel export] invoicing disabled
|
2016-11-16 15:08:24 +01:00 |
|
Sylvain
|
da71ba783c
|
[bug] exports for events reservation always have seats=1 (fixes #54)
|
2016-11-09 15:01:58 +01:00 |
|
Peng DU
|
99cca406d5
|
fix bug: event date period dant show correct in invoice
|
2016-11-03 12:17:19 +01:00 |
|
Peng DU
|
9dca65786a
|
fix project step images height bug
|
2016-11-03 11:26:01 +01:00 |
|
Peng DU
|
ba5e5752a4
|
allow add more picture for project step
|
2016-11-02 14:58:06 +01:00 |
|