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 |
|
Sylvain
|
0e1546ee68
|
fix typo
|
2016-07-25 10:06:49 +02:00 |
|
Peng DU
|
bf731d293d
|
update locale
|
2016-07-21 16:32:58 +02:00 |
|
Peng DU
|
c220678ea5
|
change some texts in reservation on site
|
2016-07-21 16:32:58 +02:00 |
|
Peng DU
|
5d84dcb666
|
update locale
|
2016-07-21 16:32:57 +02:00 |
|
Peng DU
|
f2010e752d
|
show pay by wallet in invoice
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
773c1adf4a
|
edit invoice reference
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
2c49285740
|
avoir by wallet
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
4f42253d3d
|
wallet transaction list operation locale
|
2016-07-21 16:32:55 +02:00 |
|
Peng DU
|
2dbc026db1
|
pay subscription by wallet
|
2016-07-21 16:32:55 +02:00 |
|
Peng DU
|
fc7eaaab94
|
add notification and alert when user wallet credit
|
2016-07-21 16:32:54 +02:00 |
|
Peng DU
|
d0956bb0aa
|
show wallet transactions of user
|
2016-07-21 16:32:54 +02:00 |
|
Peng DU
|
db8a6e8a32
|
application can show user wallet
|
2016-07-21 16:32:53 +02:00 |
|
Peng DU
|
e504f035d3
|
fix orthographie
|
2016-07-18 17:52:03 +02:00 |
|
Peng DU
|
120df2e716
|
add an aside for filter caldendar in mobile
|
2016-07-18 16:31:14 +02:00 |
|
Peng DU
|
70d623f65a
|
filter calendar by machine/formation/event or disponible
|
2016-07-14 18:36:52 +02:00 |
|
Peng DU
|
f26e211acb
|
update locale
|
2016-07-14 12:20:03 +02:00 |
|
Peng DU
|
fb26a2e358
|
add public calendar menu, view, controller, routes and refactoring calldendar config
|
2016-07-14 12:20:02 +02:00 |
|
Peng DU
|
1529e4b14e
|
allow active/disactive a training to show in training lists
|
2016-07-14 12:18:24 +02:00 |
|
Sylvain
|
6839e8db38
|
Merge branch 'events' into dev
Conflicts:
CHANGELOG.md
config/locales/app.shared.en.yml
config/locales/app.shared.fr.yml
|
2016-07-13 18:32:30 +02:00 |
|
Sylvain
|
90142ae3bb
|
Merge branch 'training' into dev
|
2016-07-13 18:15:14 +02:00 |
|
Sylvain
|
68f9324725
|
Merge branch 'steps' into dev
Conflicts:
app/assets/javascripts/controllers/projects.coffee.erb
db/schema.rb
|
2016-07-13 16:10:18 +02:00 |
|
Sylvain
|
2c8001f38f
|
Merge branch 'projects' into dev
Conflicts:
app/views/api/members/show.json.jbuilder
|
2016-07-13 15:57:45 +02:00 |
|
Sylvain
|
3413c3040b
|
[ongoing] members export full infos
|
2016-07-12 17:46:19 +02:00 |
|
Sylvain
|
827b3334e1
|
migrate export subscriptions to axlsx
|
2016-07-12 13:10:06 +02:00 |
|
Sylvain
|
85912603a2
|
migrate export reservations to axlsx
|
2016-07-12 13:00:56 +02:00 |
|
Sylvain
|
d72e39f716
|
migrate export members to axlsx
|
2016-07-12 12:48:26 +02:00 |
|
Sylvain
|
022db4e486
|
export all stats indices to excel
|
2016-07-07 16:26:25 +02:00 |
|
Sylvain
|
8e8bd3f9eb
|
full subscriptions export
|
2016-07-07 15:31:22 +02:00 |
|