rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-16 01:24:03 +01:00
Code Issues Releases Activity
7,740 Commits 15 Branches 274 Tags 83 MiB
2c7a37f770
Commit Graph

253 Commits

Author SHA1 Message Date
Sylvain
2c1dbd4d82 [ongoing] help modal 2020-03-10 16:38:29 +01:00
Sylvain
bb752f1218 refactor translations to work with crowdin pull requests 2020-03-09 11:47:18 +01:00
Sylvain
6aafd0c7e1 add missing translations 2020-03-03 18:06:19 +01:00
Sylvain
5765e3d2e4 move availability options to new step + wording 2020-03-02 16:52:54 +01:00
Sylvain
a44bf85014 Merge branch 'slot_is_only_subscriptions' into dev 2020-03-02 16:27:26 +01:00
Sylvain
07b21f5094 Merge branch 'book_slot_at_same_time' into dev 2020-03-02 15:52:05 +01:00
Sylvain
7b955f616e fix i18n syntax + missing transaltion 2020-02-24 15:25:15 +01:00
Du Peng
b559d10b87 improve slot is only subscription 2020-02-12 12:58:17 +01:00
Sylvain
372d7f936b typos & syntax 2020-02-11 11:46:40 +01:00
Sylvain
392ddc6aa5 wording 2020-02-11 11:01:24 +01:00
Du Peng
74cc69d1bd Ability to configure reservation slot restrict for plans 2020-02-07 17:37:00 +01:00
Du Peng
7c86adde4b Ability to configure allowing or preventing member book a machine/formation/event slot if he already have a reservation the same day at the same time 2020-02-05 16:53:47 +01:00
Sylvain
97660924cb fix typo and wording 2020-01-21 11:16:49 +01:00
Du Peng
3c26c6d4bd disable add plan with reserve slot in the past 2020-01-20 16:17:10 +01:00
Sylvain
d4f7ff3603 fixes comments syntax for crowdin compat 2019-12-24 11:47:31 +01:00
Sylvain
ff8319b166 harmonize front translations in english with new model 2019-12-18 14:35:29 +01:00
Sylvain
c565d9ff2b unified front-end i18n interpolations syntax to messageformat 2019-12-16 10:16:11 +01:00
Sylvain
510c802ab1 messages variations depending on slot duration 2019-12-09 10:27:50 +01:00
Sylvain
22251e6516 summary screen 
TODO: eventModal.html.erb:167
 2019-11-12 16:28:10 +01:00
Sylvain
aef4cc49f2 fixes accounting codes setting + improved error handling 2019-09-17 13:00:25 +02:00
Sylvain
539eb08b89 ability to disable the online payments through an env var 2019-09-11 17:08:00 +02:00
Sylvain
04f17d44d8 handle sca in js frontend 2019-09-10 12:46:02 +02:00
Sylvain
e9e27663cd quick coding rules checking with rubocop 2019-09-09 18:04:31 +02:00
Sylvain
967f539ad9 [ongoing] update to stripe-js:v3 to use strong customer authentication 2019-09-04 17:20:18 +02:00
Sylvain
43ff06c35d fixed and improved translations 2019-04-18 11:35:09 +02:00
Sylvain
b9e7276394 fix missing translation 2019-01-16 12:08:27 +01:00
Sylvain
a2eb10331e [ongoing] remove invoicing disabled per user 2019-01-10 16:50:54 +01:00
Sylvain
9fe828f51c improved translations 2019-01-02 17:11:18 +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
1c8d362f11 ability to disable space 2017-10-11 14:58:38 +02:00
Sylvain
05d9e62dd2 ability to disabled training 2017-10-10 17:16:43 +02:00
Sylvain
40bf22279e add warning on plan disabling 2017-10-05 15:44:06 +02:00
Sylvain
26d79e5b12 disable a plan 2017-10-04 18:56:39 +02:00
Sylvain
2ccc9e9dbd [bug] missing translation for EN and PT 2017-08-24 12:46:58 +02:00
Sylvain
5abc85ae0a [feature] weekly plans 2017-03-21 13:06:02 +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
42819b18cb refactor plan form translations mapping 2017-02-14 16:19:10 +01:00
Sylvain
0adb9e29c6 space edition interface 2017-02-14 13:36:10 +01:00
Sylvain
da95e6e0d8 space creation interface 2017-02-14 11:28:07 +01:00
Sylvain
b44089a33d interface & api to build avoir for a wallet credit 2016-12-12 14:20:26 +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
ad2911529c db model, api and interface for cash coupons 2016-11-23 12:43:42 +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
36524d4cd9 display list of allowed extensions in project's CAD attachments 2016-09-27 14:08:04 +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
9aef331596 add textual indications about empty fields in coupon form 2016-09-01 14:54:24 +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
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
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
a6ded12ee9 create/delete coupons on stripe + adjust schema to match stripe requirements 2016-08-08 14:42:17 +02:00
Sylvain
13e84f434d i18n english 2016-08-08 12:14:10 +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
bd54ad8158 ability to share events on social networks twitter & fb 2016-08-01 16:19:50 +02:00
Sylvain
5cacb1d34a notify admin when users exports are running 2016-07-28 10:28:43 +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
5d84dcb666 update locale 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
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
e13870555b ability to link filters to events 2016-06-29 17:05:42 +02:00
Sylvain
bdda4cd7b0 [feature] ability to filter events by category, theme and age 2016-06-29 16:09:27 +02:00
Sylvain
7d02fa9d9a rename Courses/Workshops to Events 2016-06-28 11:42:20 +02:00
Sylvain
f924144fda [feature] member select with lazy loading 2016-06-14 09:57:39 +02:00
Sylvain
48a90bb7b4 advanced project step modulation with automatic re-ordering 2016-06-02 16:02:08 +02:00
Sylvain
1bc9db2a65 [feature] 'new project' button in dashboard/my projects 2016-06-01 11:15:01 +02:00
Sylvain
0be0935474 [feature] add user's job to profile 2016-05-26 12:34:30 +02:00
Sylvain
b19765ad4a change placeholders for social networks + remove contributor status label top margin 2016-05-18 17:21:10 +02:00
Sylvain
284879e0d4 private profile 2016-05-17 17:43:29 +02:00
Sylvain
88de9c3c75 [feature] profile website + edition of is_allow_contact 2016-05-16 14:46:57 +02:00
Sylvain
ca3cd278a4 i18n social networks 2016-05-16 11:30:03 +02:00
Sylvain
a5dd2153d6 move i18n public profile 2016-05-12 15:46:18 +02:00
Sylvain
b4ad735d7f change interface for SSO/email already used 2016-04-25 14:30:03 +02:00
Sylvain
0273783b91 fix missing translation 2016-03-31 13:13:31 +02:00
Sylvain
9bf6025b53 Revert "ask for user agreement to CGV on signup" 
This reverts commit 2bf5a60ab5.
 2016-03-31 13:00:54 +02:00
Sylvain
2bf5a60ab5 ask for user agreement to CGV on signup 2016-03-31 12:18:07 +02:00
Sylvain
6f50d59054 fix english typo 2016-03-29 17:06:30 +02:00
Sylvain
efe813945a fixes 
- english typo
- [bug] unable to send devise mail
 2016-03-24 17:02:42 +01:00
cyril
d1450f65f6 release 2.0 rc 2016-03-23 18:39:41 +01:00