114 Commits

Author	SHA1	Message	Date
Peng DU	5d84dcb666	update locale	2016-07-21 16:32:57 +02:00
Peng DU	7be60c2d00	fix locale key no found error	2016-07-21 16:32:56 +02:00
Peng DU	773c1adf4a	edit invoice reference	2016-07-21 16:32:56 +02:00
Peng DU	4f42253d3d	wallet transaction list operation locale	2016-07-21 16:32:55 +02:00
Peng DU	2dbc026db1	pay subscription by wallet	2016-07-21 16:32:55 +02:00
Peng DU	31d5c6d3b3	pay totalement/partialement reservation by wallet	2016-07-21 16:32:54 +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	120df2e716	add an aside for filter caldendar in mobile	2016-07-18 16:31:14 +02:00
Peng DU	70d623f65a	filter calendar by machine/formation/event or disponible	2016-07-14 18:36:52 +02:00
Peng DU	f26e211acb	update locale	2016-07-14 12:20:03 +02:00
Peng DU	066458ca70	availability type filter	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	44b0fd8aa8	get availability border color in helper	2016-07-14 12:20:01 +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	3d7b0bbdfc	Merge remote-tracking branch 'origin/machines' into dev	2016-07-13 16:03:12 +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	8ba797bbf2	add filters in event index view	2016-07-04 11:11:00 +02:00
Sylvain	3f6890825b	fix events index: box sizes	2016-07-04 10:39:24 +02:00
Sylvain	981999c29f	simplify event view in index if event on a single day	2016-06-30 16:56:13 +02:00
Sylvain	abb91458b1	display filters infos in event show	2016-06-30 16:45:47 +02:00
Sylvain	fda619e422	add info message on categories management + fix existing categories slugs	2016-06-30 16:12:24 +02:00
Sylvain	5374d8d0a6	event form: do not display filters with no values	2016-06-30 09:43:24 +02:00
Sylvain	e13870555b	ability to link filters to events	2016-06-29 17:05:42 +02:00
Sylvain	09bcd7df2c	do not display events filter if no values exists for this filter	2016-06-29 16:13:42 +02:00
Sylvain	bdda4cd7b0	[feature] ability to filter events by category, theme and age	2016-06-29 16:09:27 +02:00
Sylvain	79b97eb113	[feature] manage event's age range	2016-06-29 11:21:21 +02:00
Sylvain	51cce7bbc3	[feature] manage event themes	2016-06-29 10:38:04 +02:00
Sylvain	9adc219edb	[feature] manage events categories	2016-06-28 17:06:33 +02:00
Sylvain	7d02fa9d9a	rename Courses/Workshops to Events	2016-06-28 11:42:20 +02:00
Sylvain	6df3c90da2	fix api doc link	2016-06-27 18:08:19 +02:00
Sylvain	841c2dfd3a	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-06-27 17:23:16 +02:00
Sylvain	f6f539d2fc	link to openAPI documentation in front interface	2016-06-27 17:23:05 +02:00
cyril	fb73fc23de	fix ui:list openapi	2016-06-27 17:08:18 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Peng DU	60f504c660	event categoriy is required	2016-06-22 18:56:45 +02:00
Sylvain	3e24d328a9	[feature] statistics: username link leads to admin edition	2016-06-21 14:46:00 +02:00
Sylvain	4639a15e2f	[feature] paginate statistics	2016-06-21 13:16:42 +02:00
Sylvain	cb3cd8ee11	[ongoing] paginate statistics results	2016-06-20 17:13:39 +02:00
Sylvain	ba4115a1da	Merge remote-tracking branch 'origin/plugin' into dev	2016-06-16 17:13:36 +02:00
Sylvain	f7d8d18bc8	[feature] paginate public list of members	2016-06-16 16:09:22 +02:00
Sylvain	dbeb0717df	fix show existing collaborator name in project edition	2016-06-16 11:11:03 +02:00
Sylvain	a325211552	optimization collaborators of a project	2016-06-16 09:30:38 +02:00
Sylvain	08244d53dc	improve trainings load times ... - do not eager load trainings availabilities in INDEX action if not requsted - in trainings monitoring (font), do not load all availabilities for all traninings by default, by select a training first to load its availabilities	2016-06-15 12:01:09 +02:00
Sylvain	027e18a020	fix typo	2016-06-14 10:51:20 +02:00
Sylvain	f924144fda	[feature] member select with lazy loading	2016-06-14 09:57:39 +02:00