Sylvain
|
ec0f597067
|
[sso] display strategy name in providers list
|
2016-09-13 12:06:25 +02:00 |
|
Sylvain
|
9d599a14e5
|
display custom aggregations in front statistics
|
2016-09-06 16:53:04 +02:00 |
|
Sylvain
|
b9411366c2
|
update nb of free places after moving an event reservation with custom prices
|
2016-08-30 12:34:36 +02:00 |
|
Sylvain
|
feda4861f2
|
ability to move reservation with custom fares reservations
|
2016-08-30 11:27:25 +02:00 |
|
Sylvain
|
f175b4b28e
|
display custom prices places names in reservation summary after booking an event
|
2016-08-30 10:17:52 +02:00 |
|
Sylvain
|
8aef50660a
|
show custom price reservations in admin/events/show reservations
|
2016-08-29 17:51:11 +02:00 |
|
Sylvain
|
3d1c852576
|
show custom prices bookings in admin/editMember
|
2016-08-29 16:54:10 +02:00 |
|
Sylvain
|
af883ea1ec
|
show custom price tickets booked in event show
|
2016-08-29 16:28:26 +02:00 |
|
Sylvain
|
4fd31c3e9b
|
display custom prices in event show
|
2016-08-25 15:36:52 +02:00 |
|
Sylvain
|
5d91756ace
|
ability to edit event with custom prices
|
2016-08-25 13:56:07 +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
|
cc1d6e4f21
|
[not tested] send reminder notification every hours for upcoming reservations
|
2016-08-17 17:39:12 +02:00 |
|
Sylvain
|
428b2db0ea
|
send a coupon to a user
|
2016-08-16 18:12:13 +02:00 |
|
Sylvain
|
a63c1830cd
|
better fix for events categories
|
2016-08-11 11:33:55 +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
|
7c434db09a
|
interface to create new coupons
|
2016-08-04 18:13:19 +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
|
ce31c1412b
|
coupons usages are counted with invoices
|
2016-08-04 09:45:00 +02:00 |
|
Sylvain
|
84a7e81813
|
API for coupons
|
2016-08-03 17:56:36 +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
|
5f96c9916d
|
[feature] newsletter : ask conscent + export in xlsx
|
2016-07-28 12:20:51 +02:00 |
|
Sylvain
|
a2066d8c09
|
[feature]async generation of users exports
|
2016-07-27 17:00:06 +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
|
32d239f723
|
[Bug #28] Event type disappear when editing the event
|
2016-07-25 16:16:25 +02:00 |
|
Peng DU
|
909c204af5
|
show invoice download link in wallet transaction debit operator
|
2016-07-21 16:32:57 +02:00 |
|
Peng DU
|
4f42253d3d
|
wallet transaction list operation locale
|
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
|
79ef7f4188
|
refactoring show training controller and add a new action avaibilities
|
2016-07-19 12:16:41 +02:00 |
|
Peng DU
|
70d623f65a
|
filter calendar by machine/formation/event or disponible
|
2016-07-14 18:36:52 +02:00 |
|
Peng DU
|
066458ca70
|
availability type filter
|
2016-07-14 12:20:03 +02:00 |
|
Peng DU
|
1fc4439df8
|
click slot to show machine fetch
|
2016-07-14 12:20:03 +02:00 |
|
Peng DU
|
49ee5011c1
|
show availability with reservation state
|
2016-07-14 12:20:02 +02:00 |
|
Peng DU
|
e9c1584968
|
availability public api
|
2016-07-14 12:20:02 +02:00 |
|
Peng DU
|
44b0fd8aa8
|
get availability border color in helper
|
2016-07-14 12:20:01 +02:00 |
|
Peng DU
|
0af0cc7878
|
update angular-ui-calendar and ajax load availabilites
|
2016-07-14 12:20:01 +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
|
e765267bb5
|
fix export for missing users
|
2016-07-13 18:09:32 +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
|
cbeb78fd7e
|
fix members full export
|
2016-07-13 09:20:52 +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 |
|