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
|
531a89945b
|
member form: add asterisks on mendatory fields
|
2016-12-14 13:05:42 +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
|
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
|
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
|
38653d22d1
|
fix events description on the home page
|
2016-11-16 16:55:56 +01:00 |
|
Sylvain
|
c04ed51f85
|
[bug] translation conflict
|
2016-11-09 14:35:02 +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 |
|
Sylvain
|
f9220d44a0
|
fix i_accept_to_receive_information_from_the_fablab in sign-up modal
|
2016-10-26 16:35:10 +02:00 |
|
Sylvain
|
42f7b3c75c
|
add HTML in event description
|
2016-10-26 16:33:21 +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
|
fc747c55c7
|
wallet credit confirmation
|
2016-09-29 13:02:24 +02:00 |
|
Sylvain
|
1ef2c11355
|
add links to RSS feeds into application header
|
2016-09-29 11:54:08 +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
|
d45ca7213f
|
updated changelog
|
2016-09-27 14:10:00 +02:00 |
|
Sylvain
|
36524d4cd9
|
display list of allowed extensions in project's CAD attachments
|
2016-09-27 14:08:04 +02:00 |
|
Sylvain
|
bf9ea40648
|
[feature #40] project images will show in full-size on a click
|
2016-09-27 11:50:05 +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
|
24a0f5533c
|
fix unable to view dashboard nav buttons on small devices + fix responsive issues on admin views
|
2016-09-27 09:55:24 +02:00 |
|
cyril
|
b2b66e7910
|
display the edit button for admin
|
2016-09-23 14:43:34 +02:00 |
|
cyril
|
c14a4d03c5
|
ui: machines and trainings list : remove the description
|
2016-09-23 14:42:53 +02:00 |
|
cyril
|
70a95ffcd7
|
Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev
|
2016-09-23 14:40:47 +02:00 |
|
cyril
|
eed8f6519e
|
display caret icon for small screen in profil nav
|
2016-09-23 14:40:41 +02:00 |
|
Peng DU
|
fc9aeb00a2
|
remove edit wallet reference from facture
|
2016-09-23 12:52:43 +02:00 |
|
Peng DU
|
0f7238bbba
|
fix wallet amount display error
|
2016-09-23 11:46:58 +02:00 |
|
Peng DU
|
cfd92cdc40
|
fix bug: code promotion change slot's price original
|
2016-09-20 18:39:28 +02:00 |
|
Sylvain
|
32a79bec1b
|
[bug] clicking on the text in stripe's payment modal, does not validate the checkbox
|
2016-09-15 18:22:52 +02:00 |
|
Sylvain
|
638747ff0e
|
[SSO] improved boolean mapping interface
|
2016-09-15 18:15:23 +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
|
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
|
ec0f597067
|
[sso] display strategy name in providers list
|
2016-09-13 12:06:25 +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
|
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
|
c3505c1419
|
fix coupon discount if reservation+subscription when pay by stripe
|
2016-09-01 11:36:51 +02:00 |
|
Sylvain
|
cb42b46790
|
[Bug] machine name is not shown in plan edition
|
2016-08-31 17:01:01 +02:00 |
|
Sylvain
|
4f41aa6554
|
event custom prices: various fixes and removed artifacts
|
2016-08-30 13:07:47 +02:00 |
|
Sylvain
|
7de896feb9
|
display 'pay' button when booking only custom prices tickets
|
2016-08-30 12:11:51 +02:00 |
|
Sylvain
|
8aef50660a
|
show custom price reservations in admin/events/show reservations
|
2016-08-29 17:51:11 +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
|
af883ea1ec
|
show custom price tickets booked in event show
|
2016-08-29 16:28:26 +02:00 |
|
Sylvain
|
06d65c785a
|
reserve event with custom prices
|
2016-08-29 15:43:47 +02:00 |
|
Sylvain
|
12eadb8ceb
|
interface for booking event custom prices
|
2016-08-29 11:09:36 +02:00 |
|
Sylvain
|
4fd31c3e9b
|
display custom prices in event show
|
2016-08-25 15:36:52 +02:00 |
|
Sylvain
|
05b010b83f
|
fix ability to edit custom prices
|
2016-08-25 14:13:30 +02:00 |
|
Sylvain
|
5d91756ace
|
ability to edit event with custom prices
|
2016-08-25 13:56:07 +02:00 |
|
Sylvain
|
7dc359e4ee
|
associate custom price categories to an event
|
2016-08-25 13:16:47 +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
|
ead7eda76b
|
interface structure refactoring for fares' categories
|
2016-08-23 17:49:28 +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
|
63e767bd18
|
refactored settings page
|
2016-08-17 10:10:23 +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
|
8ae3cf25b8
|
fix display success after admin subscribe plan
|
2016-08-11 18:30:59 +02:00 |
|
Sylvain
|
ba559d87fb
|
use coupon in plan subscription
|
2016-08-11 18:17:28 +02:00 |
|
Sylvain
|
d955f5d3e1
|
use coupon in event reservation
|
2016-08-11 12:34:55 +02:00 |
|
Sylvain
|
e122b99ebb
|
coupon usage in trainings
|
2016-08-10 16:53:40 +02:00 |
|
Sylvain
|
def5384a38
|
validation of validity_per_user on coupon usage
|
2016-08-10 11:08:01 +02:00 |
|
Sylvain
|
b4e28b94f3
|
apply coupon in payment modal + fix update user w/o organization
|
2016-08-09 17:20:38 +02:00 |
|
Sylvain
|
a679bc1638
|
compute price including coupon discount
|
2016-08-09 16:36:14 +02:00 |
|
Sylvain
|
d1c1a614a9
|
i18n coupon directive
|
2016-08-09 10:22:01 +02:00 |
|
Sylvain
|
5ce0097aa3
|
[ongoing] coupon validation and usage directive
|
2016-08-08 17:09:05 +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
|
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
|
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
|
b3f56cefd4
|
alert user about ongoing running export
|
2016-07-27 15:42:29 +02:00 |
|
Sylvain
|
7843cd1f8e
|
fix typo
|
2016-07-27 12:34:42 +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 |
|
Sylvain
|
54740d13f8
|
Fix i18n for stripe payment dialog
|
2016-07-25 12:14:38 +02:00 |
|
Sylvain
|
3b9d1b398b
|
Fix i18n for payment dialog
|
2016-07-25 12:10:10 +02:00 |
|
Peng DU
|
c220678ea5
|
change some texts in reservation on site
|
2016-07-21 16:32:58 +02:00 |
|
Peng DU
|
909c204af5
|
show invoice download link in wallet transaction debit operator
|
2016-07-21 16:32:57 +02:00 |
|
Peng DU
|
56f2ea4172
|
always use debit text
|
2016-07-21 16:32:57 +02:00 |
|
Peng DU
|
5d84dcb666
|
update locale
|
2016-07-21 16:32:57 +02:00 |
|
Peng DU
|
7be60c2d00
|
fix locale key no found error
|
2016-07-21 16:32:56 +02:00 |
|
Peng DU
|
773c1adf4a
|
edit invoice reference
|
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
|
31d5c6d3b3
|
pay totalement/partialement reservation by wallet
|
2016-07-21 16:32:54 +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
|
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
|
066458ca70
|
availability type filter
|
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
|
44b0fd8aa8
|
get availability border color in helper
|
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
|
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
|
3d7b0bbdfc
|
Merge remote-tracking branch 'origin/machines' into dev
|
2016-07-13 16:03:12 +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
|
b489b5d270
|
change export links to xlsx
|
2016-07-12 13:41:19 +02:00 |
|
Sylvain
|
d84238b331
|
statistics: global export to excel
|
2016-07-12 12:03:38 +02:00 |
|
Sylvain
|
8e968f7813
|
fix type key transmission
|
2016-07-07 16:57:23 +02:00 |
|
Sylvain
|
8e8bd3f9eb
|
full subscriptions export
|
2016-07-07 15:31:22 +02:00 |
|
Sylvain
|
eec004d1ba
|
cancel button does not trigger the generation
|
2016-07-06 19:04:04 +02:00 |
|
Sylvain
|
e8b1c99d2a
|
Alleluia git add . Downloading xls from front is working
|
2016-07-06 15:53:09 +02:00 |
|
Sylvain
|
d307f91983
|
use an hidden form to post export data
|
2016-07-05 17:23:14 +02:00 |
|
Sylvain
|
38c00391fc
|
basic UI and API for exporting stats to excel
|
2016-07-04 17:15:37 +02:00 |
|
Sylvain
|
8ba797bbf2
|
add filters in event index view
|
2016-07-04 11:11:00 +02:00 |
|
Sylvain
|
3f6890825b
|
fix events index: box sizes
|
2016-07-04 10:39:24 +02:00 |
|
Sylvain
|
981999c29f
|
simplify event view in index if event on a single day
|
2016-06-30 16:56:13 +02:00 |
|
Sylvain
|
abb91458b1
|
display filters infos in event show
|
2016-06-30 16:45:47 +02:00 |
|
Sylvain
|
fda619e422
|
add info message on categories management + fix existing categories slugs
|
2016-06-30 16:12:24 +02:00 |
|
Sylvain
|
5374d8d0a6
|
event form: do not display filters with no values
|
2016-06-30 09:43:24 +02:00 |
|
Sylvain
|
e13870555b
|
ability to link filters to events
|
2016-06-29 17:05:42 +02:00 |
|
Sylvain
|
09bcd7df2c
|
do not display events filter if no values exists for this filter
|
2016-06-29 16:13:42 +02:00 |
|
Sylvain
|
bdda4cd7b0
|
[feature] ability to filter events by category, theme and age
|
2016-06-29 16:09:27 +02:00 |
|
Sylvain
|
79b97eb113
|
[feature] manage event's age range
|
2016-06-29 11:21:21 +02:00 |
|
Sylvain
|
51cce7bbc3
|
[feature] manage event themes
|
2016-06-29 10:38:04 +02:00 |
|
Sylvain
|
9adc219edb
|
[feature] manage events categories
|
2016-06-28 17:06:33 +02:00 |
|
Sylvain
|
7d02fa9d9a
|
rename Courses/Workshops to Events
|
2016-06-28 11:42:20 +02:00 |
|
Sylvain
|
6df3c90da2
|
fix api doc link
|
2016-06-27 18:08:19 +02:00 |
|