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

..

assets

Merge branch 'steps' into dev

2016-07-13 16:10:18 +02:00

controllers

Merge branch 'steps' into dev

2016-07-13 16:10:18 +02:00

doc/open_api

adds open_api's documentation

2016-05-05 15:02:02 +02:00

exceptions

release 2.0 rc

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

flow_workers

release 2.0 rc

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

helpers

release 2.0 rc

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

mailers

fix invoice attachement name

2016-03-29 18:02:40 +02:00

models

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

pdfs/pdf

prevent subscription creation/modification if card_token is invalid

2016-04-11 18:37:15 +02:00

policies

Merge remote-tracking branch 'origin/open-api' into dev

2016-06-27 16:31:50 +02:00

services

dont compute member list if not complete

2016-06-22 17:28:04 +02:00

sweepers

release 2.0 rc

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

uploaders

release 2.0 rc

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

validators

prevent subscription creation/modification if card_token is invalid

2016-04-11 18:37:15 +02:00

views

Merge branch 'steps' into dev

2016-07-13 16:10:18 +02:00

workers

creates models open_api client and calls_count_tracing, adds worker to trace calls count

2016-05-04 11:48:14 +02:00