299 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	8bd4e6897d	fix redirect after training edition	2016-06-23 12:46:14 +02:00
Sylvain	7e1b05d339	updated ngUpload + [ongoing] fixing adding/updating training	2016-06-22 17:15:19 +02:00
Sylvain	7deefd0e57	add missing fields in training form	2016-06-22 11:25:48 +02:00
Sylvain	ca73e83f7e	advanced training UI w/ i18n	2016-06-21 17:35:53 +02:00
Sylvain	644a5a9d47	[ongoing][UI] advanced trainings management	2016-06-21 17:05:49 +02:00
Peng DU	2df2d8796d	add ngSanitize	2016-06-21 13:03:54 +02:00
Peng DU	9e1468cb31	remove ngAnimate for fix bug cant click element on Chrome 51	2016-06-20 13:20:54 +02:00
Peng DU	beddae497a	fix test user reservation without plan	2016-06-20 12:54:51 +02:00
Sylvain	3bdecbe7fc	[bug] prevent linking field User.merged_at from SSO	2016-06-20 11:46:41 +02:00
Sylvain	0466dd9ffc	add dev docker resources folder to gitignore	2016-06-16 18:15:17 +02:00
Nicolas Florentin	8ffbfd81ac	fix copy/paste error README plugins section	2016-06-16 18:08:20 +02:00
Nicolas Florentin	ee0a3428cd	Merge branch 'dev' of github.com:LaCasemate/fab-manager into dev	2016-06-16 18:03:24 +02:00
Nicolas Florentin	bf393b5052	adds a section for plugins	2016-06-16 18:01:45 +02:00
cyril	a8b6d1dcc8	fix:ui display price on list plans	2016-06-16 17:49:09 +02:00
cyril	8e36318188	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-06-16 17:38:02 +02:00
cyril	c94121fda0	fix plugin_registry method	2016-06-16 17:37:56 +02:00
Sylvain	be3a3e2b03	updated changelog for 2.2.0	2016-06-16 17:22:44 +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	c30b43f14a	updated readme	2016-06-16 13:03:10 +02:00
Sylvain	a358ef7dbc	Merge branch 'users' into dev	2016-06-16 12:55:29 +02:00
Sylvain	0339fd8e09	allow multi words search in users autocomplete	2016-06-16 12:55:20 +02:00
Sylvain	dbeb0717df	fix show existing collaborator name in project edition	2016-06-16 11:11:03 +02:00
Sylvain	92e117d5bd	fix db:rollback on create_unaccent_function	2016-06-16 10:39:00 +02:00
Sylvain	a325211552	optimization collaborators of a project	2016-06-16 09:30:38 +02:00
Sylvain	90f77ca929	updated changelog	2016-06-15 12:05:04 +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	b154c37656	updated README about elastic backup	2016-06-14 16:24:46 +02:00
Sylvain	963bf31eff	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-06-14 15:42:36 +02:00
Sylvain	e503d6edd8	optimize trainings API	2016-06-14 15:42:28 +02:00
Peng DU	e98523ca7f	Merge branch 'dev' of git.sleede.com:projets/fab-manager into dev	2016-06-14 14:34:10 +02:00
Peng DU	d0461f0a81	add docker-compose config file	2016-06-14 14:33:57 +02:00
Sylvain	4bc57c43d2	fix admin user select	2016-06-14 11:30:17 +02:00
Sylvain	49e23062ee	[bug] full-calendar date display on small devices	2016-06-14 10:57:27 +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
Nicolas Florentin	8431dac430	updates openprojects part in README	2016-06-13 11:34:11 +02:00
Nicolas Florentin	7d1106d4ef	adds a step in open projects setup in readme	2016-06-13 08:30:43 +02:00
Sylvain	d034fecdab	updated README	2016-06-09 12:55:31 +02:00
Sylvain	c546dc45fb	fix integration test: using ERB in cassette	2016-06-06 11:04:01 +02:00
Nicolas Florentin	93fc9722e9	fix tests regression, renaming fixture extension from .yml.erb to .yml	2016-06-03 10:10:13 +02:00
Sylvain	70ff027792	fix AdminMembersController init	2016-06-01 08:55:54 +02:00
Sylvain	fae013d973	members & invoices lists: display 20 items by default + do not display 'load more' button if all items were initially loaded	2016-05-31 17:01:26 +02:00
Sylvain	65328451ac	updated changelog	2016-05-31 10:06:18 +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
Nicolas Florentin	f158ba2890	refacto code insertion code	2016-05-26 15:14:57 +02:00
Nicolas Florentin	60c2813991	prepares schedule.yml to code insertion	2016-05-26 15:14:57 +02:00