86 Commits

Author	SHA1	Message	Date
Peng DU	dbc9a388a8	fix bug: cant click machines event in < today and > first day of week	2016-07-14 12:20:03 +02:00
Peng DU	066458ca70	availability type filter	2016-07-14 12:20:03 +02:00
Peng DU	b3ca940880	show tag in availability	2016-07-14 12:20:03 +02:00
Peng DU	1fc4439df8	click slot to show machine fetch	2016-07-14 12:20:03 +02:00
Peng DU	2b08cc8594	fix bug cant navigate to yestoday in agendaDay view	2016-07-14 12:20:02 +02:00
Peng DU	68e1b959ff	disable slotEventOverlap for agendaDay view	2016-07-14 12:20:02 +02:00
Peng DU	e9c1584968	availability public api	2016-07-14 12:20:02 +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	0af0cc7878	update angular-ui-calendar and ajax load availabilites	2016-07-14 12:20:01 +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	683bc835df	[bug] statistics: sum of stats does not work	2016-07-04 12:53:56 +02:00
Sylvain	981999c29f	simplify event view in index if event on a single day	2016-06-30 16:56:13 +02:00
Sylvain	fda619e422	add info message on categories management + fix existing categories slugs	2016-06-30 16:12:24 +02:00
Sylvain	894f836286	fix the 'load more events' button	2016-06-30 15:26:34 +02:00
Sylvain	0557cb991f	rake task for correct event statistics mapping in elastic	2016-06-30 14:14:46 +02:00
Sylvain	5a0bb86394	fix events pagniation	2016-06-30 12:41:47 +02:00
Sylvain	e36df94f0f	server-side protection against deleting used filters	2016-06-30 11:39:56 +02:00
Sylvain	c8b42f1b7f	add slugs to event filters + add categories into statistics + prevent remove linked elements in front	2016-06-30 11:24:57 +02:00
Sylvain	bb6295c487	prevent from removing the last category	2016-06-30 09:51:06 +02:00
Sylvain	859960ce3e	confirmation on event filter deletion	2016-06-30 09:34:26 +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	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	d5b06d08ad	[feature] confirmation on project deletion	2016-06-28 10:02:36 +02:00
Sylvain	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Sylvain	8e07460deb	[feature] redirect to slugged-url on publish project	2016-06-27 15:34:08 +02:00
Peng DU	df8dbfae8c	fix conflt of changelog	2016-06-27 12:42:57 +02:00
Peng DU	60f504c660	event categoriy is required	2016-06-22 18:56:45 +02:00
Peng DU	85a40db603	price cache	2016-06-21 16:04:44 +02:00
Peng DU	4d0d3d6af0	optimise load plans json	2016-06-21 14:49:39 +02:00
Sylvain	3e24d328a9	[feature] statistics: username link leads to admin edition	2016-06-21 14:46:00 +02:00
Sylvain	24f963645b	optimize usernames mapping in statistics	2016-06-21 14:39:44 +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	ddbb043a41	do not retrieve full users list on plans page	2016-06-16 14:26:10 +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	e503d6edd8	optimize trainings API	2016-06-14 15:42:28 +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