214 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sylvain	284879e0d4	private profile	2016-05-17 17:43:29 +02:00
Sylvain	0061c3dca6	reorganize profile header zone	2016-05-17 16:41:32 +02:00
Sylvain	93edd6eaa8	[ongoing] UI refactoring of public profile	2016-05-16 18:20:22 +02:00
Sylvain	88de9c3c75	[feature] profile website + edition of is_allow_contact	2016-05-16 14:46:57 +02:00
Sylvain	a430c0cef7	updated echosciences logo	2016-05-16 13:39:16 +02:00
Sylvain	ca3cd278a4	i18n social networks	2016-05-16 11:30:03 +02:00
Sylvain	6b66620686	improve social button workflow	2016-05-16 11:23:19 +02:00
Sylvain	7ec5e5ba03	[feature] allow user to add links to his socials networks	2016-05-16 11:18:30 +02:00
Sylvain	a5dd2153d6	move i18n public profile	2016-05-12 15:46:18 +02:00
Sylvain	c499771433	migrate profile edit to 'my parameters' tab and add public profile in dashboard	2016-05-12 13:53:59 +02:00
Sylvain	ff316f7bdd	updated changes log	2016-05-03 16:33:06 +02:00
Nicolas Florentin	726593c2f7	fix typo readme	2016-05-03 11:29:38 +02:00
Nicolas Florentin	806d9df331	fix typo readme	2016-05-03 11:29:14 +02:00
Nicolas Florentin	434107646d	update readme: open projects	2016-05-03 11:27:01 +02:00
Sylvain	82a9980c20	[bug] is not defined after sso profile sync	2016-05-03 09:37:15 +02:00
cyril	ad510af829	fix initializers openlab_ruby for env dev	2016-05-02 20:00:39 +02:00
Nicolas Florentin	30105e5af4	fix, openlab_ruby initializer was erasing base_uri	2016-05-02 18:35:59 +02:00
Nicolas Florentin	b6918f824c	update openlab_ruby	2016-05-02 18:13:21 +02:00
cyril	ce6979729a	add changelog file	2016-05-02 17:14:21 +02:00
cyril	65c19b3462	fix translate	2016-05-02 17:14:01 +02:00
cyril	c271d50991	Merge branch 'projects-openfablab' into dev	2016-05-02 16:56:31 +02:00
cyril	f84e633f7c	Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab	2016-05-02 16:21:26 +02:00
cyril	31d5fbbb15	fix ui projects list	2016-05-02 16:21:23 +02:00
Nicolas Florentin	d29deaad51	projects/index now save in url query param if whole_network is true	2016-05-02 16:18:24 +02:00
cyril	12bc556038	Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab	2016-05-02 16:10:54 +02:00
cyril	7288834417	ui projects list	2016-05-02 16:10:48 +02:00
Nicolas Florentin	4afb968750	fix select option for machines themes and materials when you get back to page and want your history back	2016-05-02 12:48:26 +02:00
cyril	79b69f21ba	Merge branch 'projects-openfablab' of git.sleede.com:projets/fab-manager into projects-openfablab	2016-05-02 11:55:15 +02:00
Nicolas Florentin	faf78b7f82	fix bug custom asset favicon-file favicon file is not set	2016-04-25 17:55:37 +02:00
Sylvain	b483b76042	fix arrows in SSO completion	2016-04-25 15:20:00 +02:00
Sylvain	8b8ed342c1	improve responsivness of SSO completion form	2016-04-25 15:14:12 +02:00
Sylvain	33f83180fa	fix typo and css	2016-04-25 14:34:09 +02:00
Sylvain	b4ad735d7f	change interface for SSO/email already used	2016-04-25 14:30:03 +02:00
Nicolas Florentin	542efe363b	projects#index adds tooltip to explain what search over the whole network means	2016-04-25 12:57:35 +02:00
Nicolas Florentin	960f312dc9	projects search params are saved in url query params and remain in browser history	2016-04-25 12:46:30 +02:00
Sylvain	0ee36ca022	refactor interface for SSO profile completion	2016-04-25 12:35:43 +02:00
Nicolas Florentin	4cfcbb47aa	openlab_projects ctrl, rescue all standard error	2016-04-25 10:07:54 +02:00
Nicolas Florentin	5403386c75	fallback and message if openlab server not available	2016-04-25 10:06:35 +02:00
Nicolas Florentin	1a446bf646	frontend openlab search view, ctrl, services	2016-04-22 18:17:55 +02:00
Nicolas Florentin	5ee27da51e	index updated_at, created_at, published_at datetimes	2016-04-21 18:19:55 +02:00
Nicolas Florentin	ec203a8ef8	adds minimal validation to projects	2016-04-21 17:10:50 +02:00
Nicolas Florentin	f65bb95575	almost finishes synchro with openlab system	2016-04-21 11:42:43 +02:00
Nicolas Florentin	711b18f6cd	initial commit	2016-04-20 18:13:36 +02:00
cyril	1099adb208	Merge branch 'tests' into dev	2016-04-20 11:58:09 +02:00
cyril	3ead00eabf	Merge branch '2-0-rc1' into dev	2016-04-20 11:48:50 +02:00
Nicolas Florentin	ed478f95c7	UsersCredits::Manager accept an event Reservation but do not do nothing, acting as a blackbox	2016-04-20 11:24:28 +02:00
cyril	0f09795243	fix traduction trainings.completed	2016-04-19 16:47:43 +02:00
Sylvain	34648c7e9e	event test	2016-04-13 18:33:43 +02:00
Sylvain	d880a8f0f4	fix unable to reserve Event	2016-04-13 18:21:01 +02:00
Sylvain	3016ac1e82	tests for availabilities	2016-04-13 17:26:17 +02:00