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 |
|