1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-04 15:24:23 +01:00
Commit Graph

144 Commits

Author SHA1 Message Date
Sylvain
2afd6ade8a allow user to set his organization on registration 2016-08-02 12:27:45 +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
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
31d5c6d3b3 pay totalement/partialement reservation by wallet 2016-07-21 16:32:54 +02:00
Peng DU
db8a6e8a32 application can show user wallet 2016-07-21 16:32:53 +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
2c8001f38f Merge branch 'projects' into dev
Conflicts:
	app/views/api/members/show.json.jbuilder
2016-07-13 15:57:45 +02:00
Sylvain
7d02fa9d9a rename Courses/Workshops to Events 2016-06-28 11:42:20 +02:00
Sylvain
875e513f1c Merge remote-tracking branch 'origin/open-api' into dev 2016-06-27 16:31:50 +02:00
Sylvain
ba4115a1da Merge remote-tracking branch 'origin/plugin' into dev 2016-06-16 17:13:36 +02:00
Sylvain
f924144fda [feature] member select with lazy loading 2016-06-14 09:57:39 +02:00
Sylvain
306e0322c5 [feature] display 'draft' badge on drafts 2016-06-01 10:47:00 +02:00
Nicolas Florentin
f158ba2890 refacto code insertion code 2016-05-26 15:14:57 +02:00
Nicolas Florentin
822705c54c adds necessary code to permit navi gami plugin to add data in user profile view 2016-05-26 15:14:20 +02:00
Sylvain
0be0935474 [feature] add user's job to profile 2016-05-26 12:34:30 +02:00
Sylvain
d009cf3fc1 [feature] add flickr, lastfm & pinterest 2016-05-26 12:05:28 +02:00
Sylvain
b19765ad4a change placeholders for social networks + remove contributor status label top margin 2016-05-18 17:21:10 +02:00
Sylvain
420d247590 adjust avatar position & bio titles 2016-05-18 14:28:44 +02:00
Sylvain
d8cc1ec107 fix responsive public profile 2016-05-18 11:16:55 +02:00
Sylvain
1869dd0bcf [bug] project gain collaborator i18n key FR
[UI] project display in profile
2016-05-18 10:54:50 +02:00
Sylvain
a3e0954f93 fix profile pictos style 2016-05-18 10:11:50 +02:00
Sylvain
9ee869ee3f fix regex pattern 2016-05-18 09:47:30 +02:00
Sylvain
c1c981a695 social links validation 2016-05-18 09:38:55 +02:00
Sylvain
d005712662 fix social links position & website icon 2016-05-18 09:11:08 +02:00
Sylvain
284879e0d4 private profile 2016-05-17 17:43:29 +02:00
Sylvain
0061c3dca6 reorganize profile header zone 2016-05-17 16:41:32 +02:00
Sylvain
93edd6eaa8 [ongoing] UI refactoring of public profile 2016-05-16 18:20:22 +02:00
Sylvain
88de9c3c75 [feature] profile website + edition of is_allow_contact 2016-05-16 14:46:57 +02:00
Sylvain
6b66620686 improve social button workflow 2016-05-16 11:23:19 +02:00
Sylvain
7ec5e5ba03 [feature] allow user to add links to his socials networks 2016-05-16 11:18:30 +02:00
Sylvain
c499771433 migrate profile edit to 'my parameters' tab and add public profile in dashboard 2016-05-12 13:53:59 +02:00
Nicolas Florentin
2c70903dfd admin open_api_client managing 2016-05-09 18:15:04 +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
2587eaf3cc [feature] link to CGV in about page 2016-03-31 12:59:29 +02:00
Sylvain
2bf5a60ab5 ask for user agreement to CGV on signup 2016-03-31 12:18:07 +02:00
Sylvain
6c32f7e54a fixes in datepicker
- date displayed in inputs has the correct year
- date sent to server match the selected date in html forms
- datepicker date format is configurable for i18n
2016-03-29 13:31:02 +02:00
Sylvain
e81cc1597a various fix
- handle stripe limitation: plan cannot exceed 1 year
- [bug] unable to change password
- [bug] incorrect value of plans durations in admin list
- [css] plan price was exceeding width of the container
2016-03-24 15:39:24 +01:00
cyril
d1450f65f6 release 2.0 rc 2016-03-23 18:39:41 +01:00
Sylvain
b267def130 [bug] #2
fixes the lack of user's menu on small devices (can't logout, etc)
2015-10-28 11:55:54 +01:00
Sylvain
9c8f35bd1f fix UI : dashbord button overflow on SM devices 2015-10-06 12:03:46 +02:00
cyril
d6652bd39d fixed label demo above nav 2015-05-08 13:33:24 +02:00
cyril
68eab24fa1 init depot fabmanager 2015-05-05 03:10:25 +02:00