60 Commits

Author	SHA1	Message	Date
Peng DU	49ee5011c1	show availability with reservation state	2016-07-14 12:20:02 +02:00
Peng DU	a67320121c	rename a variable	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	0af0cc7878	update angular-ui-calendar and ajax load availabilites	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	e36df94f0f	server-side protection against deleting used filters	2016-06-30 11:39:56 +02:00
Sylvain	812d7a3c05	server-side protection against last category deletion	2016-06-30 09:57:40 +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	875e513f1c	Merge remote-tracking branch 'origin/open-api' into dev	2016-06-27 16:31:50 +02:00
Peng DU	a4fcede638	fix bug: cant get member training availability	2016-06-27 13:38:50 +02:00
Peng DU	4eea18a479	fix merge	2016-06-27 12:49:20 +02:00
Peng DU	6db26e7a19	fix conflt	2016-06-27 12:47:03 +02:00
Peng DU	df8dbfae8c	fix conflt of changelog	2016-06-27 12:42:57 +02:00
Peng DU	68e45c0460	cache last event and optimise last subscript api	2016-06-27 10:55:51 +02:00
Peng DU	0bb4665b4a	avoid N+1 for users list	2016-06-24 18:43:22 +02:00
Sylvain	9e728c691f	[feature] prevent unmerged accounts (soo imported) from being displayed in lists/searches	2016-06-23 11:42:10 +02:00
Sylvain	c90f4684b9	[bug] scroll statistics tables not working when elastic is not localhost	2016-06-23 11:11:54 +02:00
Peng DU	4dff74827b	optimise machine/training availabilities query	2016-06-22 12:54:12 +02:00
Peng DU	e82372fb7b	optimise machine availabilities query	2016-06-21 19:07:47 +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	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	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	0339fd8e09	allow multi words search in users autocomplete	2016-06-16 12:55:20 +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	2b1d1fc4dd	[feature] basic ability manage steps order	2016-06-02 12:49:00 +02:00
Sylvain	3593f293ce	[feature] partial load of invoices list	2016-05-31 10:02:27 +02:00
Sylvain	820d8bba53	users list: display only active members	2016-05-30 16:39:20 +02:00
Sylvain	c8e9c6dae5	[feature] partial load of users list	2016-05-30 15:39:19 +02:00
Sylvain	0be0935474	[feature] add user's job to profile	2016-05-26 12:34:30 +02:00
Sylvain	d009cf3fc1	[feature] add flickr, lastfm & pinterest	2016-05-26 12:05:28 +02:00
Sylvain	88de9c3c75	[feature] profile website + edition of is_allow_contact	2016-05-16 14:46:57 +02:00
Sylvain	7ec5e5ba03	[feature] allow user to add links to his socials networks	2016-05-16 11:18:30 +02:00
Nicolas Florentin	2c70903dfd	admin open_api_client managing	2016-05-09 18:15:04 +02:00
Nicolas Florentin	e349adf252	adds open_api's documentation	2016-05-05 15:02:02 +02:00
Nicolas Florentin	7f032526cb	implements open_api various endpoints	2016-05-04 18:17:50 +02:00
Nicolas Florentin	1b0f9575b5	adds a base controller for open_api/v1	2016-05-04 11:59:51 +02:00