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
|
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
|
2ccc9e9dbd
|
[bug] missing translation for EN and PT
|
2017-08-24 12:46:58 +02:00 |
|
Sylvain
|
6cbdbc932c
|
fix interpolation variable in portuguese
|
2017-06-07 17:20:57 +02:00 |
|
Sylvain
|
3ca6b9c9c1
|
fix about title concordance in portuguese
|
2017-06-07 16:51:11 +02:00 |
|
Sylvain
|
b4332c9bc7
|
fix html closing tags in portuguese translations
|
2017-06-07 16:46:42 +02:00 |
|
Sylvain
|
3bf91efe8f
|
fixed messageformat syntax in Portuguese
|
2017-06-07 16:26:39 +02:00 |
|
Sylvain
|
3a6af68b67
|
Merge branch 'dev' into alexcvcoelho-master
|
2017-06-07 16:03:31 +02:00 |
|
Alex Coelho
|
1ef80f8bd8
|
Prtuguese translations in app.*.pt.yml files
|
2017-06-01 14:33:16 -03:00 |
|
Sylvain
|
54154b1713
|
[feature] ability for admins to create users or organizations
|
2017-05-16 10:23:25 +02:00 |
|
Alex Coelho
|
f3634e6891
|
Translate pt-BR
|
2017-05-11 14:15:23 -03:00 |
|
Alex Coelho
|
0ac53733c9
|
Translate pt-BR for version 2.5.4
|
2017-05-11 11:31:12 -03:00 |
|
Alex Coelho
|
e8cacb36a1
|
Update branch
|
2017-05-11 11:00:37 -03:00 |
|
Sylvain
|
ca012322fb
|
fixed rails locales files
|
2017-04-27 17:08:17 +02:00 |
|
Sylvain
|
1f7bf2a591
|
Rails l10n support for 115 new locations
|
2017-04-27 14:22:07 +02:00 |
|
Sylvain
|
5abc85ae0a
|
[feature] weekly plans
|
2017-03-21 13:06:02 +01:00 |
|
Sylvain
|
8e206cd3c5
|
[bug] subscription name is not shown in invoices
|
2017-03-15 16:31:51 +01:00 |
|
Sylvain
|
796f0a87ae
|
ability to remove an unused custom price for an event (#61)
|
2017-03-02 18:36:54 +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
|
1503e9b83f
|
fix typo
|
2017-03-01 14:20:50 +01:00 |
|
Sylvain
|
cf9181770b
|
export space statistics
|
2017-03-01 12:56:11 +01:00 |
|
Sylvain
|
b48451f9f8
|
improved space reservation optional explication message
|
2017-03-01 11:47:20 +01:00 |
|
Sylvain
|
a0e7e7951f
|
[ongoing] display spaces in public calendar
|
2017-02-28 11:59:48 +01:00 |
|
Sylvain
|
b48557fd96
|
invoice generation for space reservation
|
2017-02-27 17:42:36 +01:00 |
|
Sylvain
|
8e86c4b212
|
[ongoing] spaces reservation calendar
|
2017-02-23 17:45:55 +01:00 |
|
Sylvain
|
32a2a220bf
|
clean trainings reservation locales
|
2017-02-23 12:52:54 +01:00 |
|
Sylvain
|
71a3c8b41f
|
pluralize selection helper in cart
|
2017-02-22 16:53:58 +01:00 |
|
Sylvain
|
c2c400107d
|
improved tag management in cart
|
2017-02-22 11:23:32 +01:00 |
|
Sylvain
|
ce087ae778
|
refacto wording to make cart reservableType agnostic
|
2017-02-22 10:51:07 +01:00 |
|
Sylvain
|
7a21a907a8
|
offer slot from cart + [ongoing] refacto cart translations
|
2017-02-22 09:44:15 +01:00 |
|
Sylvain
|
a463ad6a2a
|
[ongoing] refacto cart translations
|
2017-02-21 17:45:53 +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
|
42819b18cb
|
refactor plan form translations mapping
|
2017-02-14 16:19:10 +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
|
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
|
560bb46383
|
space db model
|
2017-02-13 14:38:28 +01:00 |
|
Alex Coelho
|
09af61ab3f
|
Translate to portuguese-br rails
|
2017-02-03 15:28:14 -02:00 |
|
Alex Coelho
|
592d7be448
|
Translate to portuguese-br mails
|
2017-02-03 15:27:01 -02:00 |
|
Alex Coelho
|
9911566d51
|
Translate to portuguese-br pt-BR
|
2017-02-03 15:25:57 -02:00 |
|
Alex Coelho
|
8f40eee51a
|
Translate to portuguese-br devise
|
2017-02-03 15:25:25 -02:00 |
|
Alex Coelho
|
d613ab7fb2
|
Translate to portuguese-br app.shared
|
2017-02-03 15:24:04 -02:00 |
|
Alex Coelho
|
6b2b15b4c3
|
Translate to portuguese-br app.public
|
2017-02-03 15:23:03 -02:00 |
|
Alex Coelho
|
91d5b23dad
|
Translate to portuguese-br app.logged
|
2017-02-03 15:22:11 -02:00 |
|
Alex Coelho
|
e558fb4106
|
Translate to portuguese-br app.admin
|
2017-02-03 15:20:47 -02:00 |
|
Sylvain
|
c479502dd0
|
[bug] too many unread notifications cause system memory overflow
|
2017-01-05 15:06:54 +01:00 |
|
Sylvain
|
9bfaaaccd9
|
improved numerous notifications display
|
2016-12-19 17:08:11 +01:00 |
|
Sylvain
|
12aaa7007c
|
fix a bug about notification email for refunf invoices
|
2016-12-15 14:27:58 +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
|
d8b6848b1b
|
sso wording
|
2016-12-14 15:14:33 +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
|
9190e61f5f
|
basic avoir invoice for wallet credit
|
2016-12-12 15:32:01 +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
|
10fc7b69e9
|
Ability to display optional information message on event reservation page
|
2016-11-29 16:46:19 +01:00 |
|
Sylvain
|
f0e11cf718
|
fix pdf invoice generation with cash coupon
|
2016-11-28 09:57:09 +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
|
04e10c8bb6
|
check cash coupons does not exceed cart amount for trainings & machines
|
2016-11-24 13:58:41 +01:00 |
|
Sylvain
|
21d887945e
|
improve translation to make it sex-agnostic
|
2016-11-23 14:31:58 +01:00 |
|
Sylvain
|
51faeedfa8
|
fix translation name in plan form
|
2016-11-23 12:57:33 +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 |
|
Sylvain
|
c04ed51f85
|
[bug] translation conflict
|
2016-11-09 14:35:02 +01:00 |
|
Peng DU
|
99cca406d5
|
fix bug: event date period dant show correct in invoice
|
2016-11-03 12:17:19 +01: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
|
fc747c55c7
|
wallet credit confirmation
|
2016-09-29 13:02:24 +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
|
36524d4cd9
|
display list of allowed extensions in project's CAD attachments
|
2016-09-27 14:08:04 +02:00 |
|
Sylvain
|
6401b321ef
|
[feature] display fab-manager's version, when logged as admin
|
2016-09-22 16:46:14 +02:00 |
|
Sylvain
|
13f416a101
|
[sso] save and restore field data mapping
|
2016-09-15 15:58:21 +02:00 |
|
Sylvain
|
ee333df53f
|
improved transformation interface
|
2016-09-14 18:54:53 +02:00 |
|
Sylvain
|
77626aa674
|
[SSO] interface for transforming boolean and dates datatypes
|
2016-09-14 18:52:18 +02:00 |
|
Sylvain
|
50543b8d09
|
[sso] give informations about the expected data in sso mapping
|
2016-09-14 16:41:45 +02:00 |
|
Sylvain
|
ec0f597067
|
[sso] display strategy name in providers list
|
2016-09-13 12:06:25 +02:00 |
|
Sylvain
|
b7c41e89c4
|
fix locale of notify_auth_changed mails
|
2016-09-13 10:48:07 +02:00 |
|
Sylvain
|
2607836203
|
fix message in case of wrong mime type
|
2016-09-07 15:56:41 +02:00 |
|
Sylvain
|
19e89cce3d
|
[feature] validate project attachement by mime type
|
2016-09-07 15:44:19 +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
|
9aef331596
|
add textual indications about empty fields in coupon form
|
2016-09-01 14:54:24 +02:00 |
|
Sylvain
|
0ffe5733d6
|
fix typo & completed deployment process in changelog
|
2016-08-31 15:44:23 +02:00 |
|
Sylvain
|
e281a20ada
|
database migration to event price category
|
2016-08-30 18:30:21 +02:00 |
|
Sylvain
|
4f41aa6554
|
event custom prices: various fixes and removed artifacts
|
2016-08-30 13:07:47 +02:00 |
|
Sylvain
|
60a8f60be8
|
display custom prices in events index
|
2016-08-29 17:33:21 +02:00 |
|
Sylvain
|
7bc19f540d
|
show custom price event bookings in dashboard
|
2016-08-29 17:21:20 +02:00 |
|
Sylvain
|
3d1c852576
|
show custom prices bookings in admin/editMember
|
2016-08-29 16:54:10 +02:00 |
|
Sylvain
|
d47a5aea5f
|
statistics generation for event with custom prices
|
2016-08-29 16:44:07 +02:00 |
|
Sylvain
|
d86cccf98c
|
custom prices in invoice generation
|
2016-08-29 16:37:51 +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
|
cc1d6e4f21
|
[not tested] send reminder notification every hours for upcoming reservations
|
2016-08-17 17:39:12 +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
|
8aa5d5e4f5
|
allow dashes in coupon codes
|
2016-08-17 09:53:58 +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 |
|
Sylvain
|
6e1dfda8f5
|
show coupon details in invoice
|
2016-08-10 16:33:26 +02:00 |
|
Sylvain
|
def5384a38
|
validation of validity_per_user on coupon usage
|
2016-08-10 11:08:01 +02:00 |
|
Sylvain
|
2f2099b723
|
fix EN translations
|
2016-08-09 11:41:40 +02:00 |
|
Sylvain
|
d1c1a614a9
|
i18n coupon directive
|
2016-08-09 10:22:01 +02:00 |
|
Sylvain
|
e2ea64cf9c
|
coupon edition + refactored coupon status
|
2016-08-08 15:21:33 +02:00 |
|
Sylvain
|
a6ded12ee9
|
create/delete coupons on stripe + adjust schema to match stripe requirements
|
2016-08-08 14:42:17 +02:00 |
|
Sylvain
|
35b324e108
|
coupon safe destroy
|
2016-08-08 12:25:27 +02:00 |
|
Sylvain
|
13e84f434d
|
i18n english
|
2016-08-08 12:14:10 +02:00 |
|
Sylvain
|
23320104c5
|
ability to edit coupons
|
2016-08-08 12:08:09 +02:00 |
|
Sylvain
|
7c434db09a
|
interface to create new coupons
|
2016-08-04 18:13:19 +02:00 |
|
Sylvain
|
ee03f1a79c
|
admin interface to list coupons
|
2016-08-04 14:26:07 +02:00 |
|
Sylvain
|
0eaa81b0ba
|
extracted some heavy admin views into sub-templates files & fixed uncomplete users display behavior in admin list
|
2016-08-04 12:08:33 +02:00 |
|
Sylvain
|
c9a7c599c0
|
notify admin about organization registration & organization server validation
|
2016-08-02 18:06:07 +02:00 |
|
Sylvain
|
af94b62ff1
|
add organization infos to members xlsx export
|
2016-08-02 15:28:24 +02:00 |
|
Sylvain
|
33358c2fb5
|
ability to edit organization in profile & ablity to link its params from an sso
|
2016-08-02 15:11:26 +02:00 |
|
Sylvain
|
2afd6ade8a
|
allow user to set his organization on registration
|
2016-08-02 12:27:45 +02:00 |
|
Sylvain
|
bd54ad8158
|
ability to share events on social networks twitter & fb
|
2016-08-01 16:19:50 +02:00 |
|
Sylvain
|
26d5e5e42c
|
allow social share of projects on twitter & facebook
|
2016-08-01 15:45:56 +02:00 |
|
Sylvain
|
5f96c9916d
|
[feature] newsletter : ask conscent + export in xlsx
|
2016-07-28 12:20:51 +02:00 |
|
Sylvain
|
5cacb1d34a
|
notify admin when users exports are running
|
2016-07-28 10:28:43 +02:00 |
|
Sylvain
|
a2066d8c09
|
[feature]async generation of users exports
|
2016-07-27 17:00:06 +02:00 |
|
Sylvain
|
b3f56cefd4
|
alert user about ongoing running export
|
2016-07-27 15:42:29 +02:00 |
|
Sylvain
|
4d2f46ca95
|
[feature] Async statistics export to XLSX
- fix tests due to removal of event_categories
- rake task for generating statistics
|
2016-07-27 11:28:54 +02:00 |
|
Sylvain
|
74154cf1f3
|
Merge branch 'xls' into dev
Conflicts:
CHANGELOG.md
app/helpers/application_helper.rb
config/locales/en.yml
config/locales/fr.yml
|
2016-07-25 16:56:22 +02:00 |
|
Sylvain
|
3b9d1b398b
|
Fix i18n for payment dialog
|
2016-07-25 12:10:10 +02:00 |
|