Sylvain 2c8001f38f Merge branch 'projects' into dev ...

Conflicts:
	app/views/api/members/show.json.jbuilder

2016-07-13 15:57:45 +02:00

..

admin

fix api doc link

2016-06-27 18:08:19 +02:00

dashboard

[feature] 'new project' button in dashboard/my projects

2016-06-01 11:15:01 +02:00

events

event categoriy is required

2016-06-22 18:56:45 +02:00

machines

[feature] member select with lazy loading

2016-06-14 09:57:39 +02:00

members

[feature] paginate public list of members

2016-06-16 16:09:22 +02:00

notifications

release 2.0 rc

2016-03-23 18:39:41 +01:00

plans

[feature] member select with lazy loading

2016-06-14 09:57:39 +02:00

profile

[feature] profile website + edition of is_allow_contact

2016-05-16 14:46:57 +02:00

projects

Merge branch 'projects' into dev

2016-07-13 15:57:45 +02:00

shared

Merge branch 'projects' into dev

2016-07-13 15:57:45 +02:00

stripe

release 2.0 rc

2016-03-23 18:39:41 +01:00

trainings

[feature] member select with lazy loading

2016-06-14 09:57:39 +02:00

home.html.erb

fix french typo

2016-03-31 14:08:33 +02:00