997 Commits

Author	SHA1	Message	Date
maxime_senza	f25ca6557f	feature: job board : colors variables	2020-06-16 02:01:21 +02:00
Jean-Baptiste Pasquier	6b3e7fd73c	bump job board version	2020-06-15 21:16:52 +02:00
Jean-Baptiste Pasquier	5e5b306895	fix dist folder of local job board	2020-06-15 21:00:42 +02:00
gaelle morin	052e325e15	fix: new classes added to admin-project-create	2020-06-15 20:12:57 +02:00
gaelle morin	985764874a	fix: new classes added to admin-project (end)	2020-06-15 19:30:27 +02:00
gaelle morin	18bea2e3e6	Merge branch 'release/project' of git.startinblox.com:applications/sib-app into fix/project	2020-06-15 18:57:13 +02:00
Jean-Baptiste Pasquier	b8e5ef316e	Merge branch 'master' into release/project	2020-06-15 18:50:51 +02:00
Jean-Baptiste Pasquier	70de29a517	fix: contact width on about page	2020-06-15 17:59:05 +02:00
gaelle morin	aafc8654f5	fix: circle leave fixed	2020-06-15 17:48:36 +02:00
gaelle morin	c263beb6b4	fix: important added	2020-06-15 17:18:03 +02:00
gaelle morin	4e0f307a83	fix: colors moved to client.sample.happy-dev.css	2020-06-15 16:32:47 +02:00
gaelle morin	54da12c7a3	fix: new classes added to admin-project	2020-06-15 16:06:01 +02:00
Jean-Baptiste Pasquier	f5884e0d8a	fix dependencies	2020-06-15 12:36:47 +00:00
gaelle morin	d70fd6dac8	fix: new classes added to project-edit + fixbug on table for project- and circle-edit	2020-06-15 14:27:49 +02:00
Jure Ursic	628fec9a94	fix: merge conflicts	2020-06-15 13:58:51 +02:00
Jure Ursic	34ec5d9d38	feature: project picture	2020-06-15 13:56:13 +02:00
gaelle morin	661f5c0f5b	fix: new classes added to project-profile	2020-06-15 12:59:43 +02:00
gaelle morin	9a084d5cae	fix: colors for directory with hubl colors	2020-06-15 10:15:19 +02:00
Jean-Baptiste Pasquier	de2e61fdf1	Merge branch 'release/rework-css' into release/project	2020-06-13 17:07:46 +02:00
Jean-Baptiste Pasquier	18c98fa21d	fix: directory colors	2020-06-13 17:05:33 +02:00
Jean-Baptiste Pasquier	e603b3f87e	hotfix: variable color	2020-06-13 16:50:43 +02:00
Jean-Baptiste Pasquier	bf87b89d35	Merge branch 'release/rework-css' into release/project	2020-06-13 16:34:38 +02:00
Jean-Baptiste Pasquier	6248055946	hotfix: variable color	2020-06-13 16:33:45 +02:00
Jean-Baptiste Pasquier	518864e093	Merge branch 'release/project' into release/rework-css	2020-06-13 16:10:50 +02:00
Jean-Baptiste Pasquier	17eed1d4ad	Merge branch 'master' into release/project	2020-06-13 16:08:41 +02:00
Jean-Baptiste Pasquier	c598a79a85	Merge branch 'master' into release/rework-css	2020-06-13 16:04:52 +02:00
gaelle morin	99ea055f03	fix: colors for directory	2020-06-13 01:50:44 +02:00
gaelle morin	0927041e4a	bugfix: header inner borders + depreciated .box-button + chat textarea + width of buttons	2020-06-12 20:24:22 +02:00
gaelle morin	e8f52cd1b6	bugfix: local paths used	2020-06-12 16:07:53 +02:00
gaelle morin	fe35c4f5df	bugfix: notification kist display on small screen (positionning of other views	2020-06-12 15:32:38 +02:00
gaelle morin	c38c62b656	bugfix: notification kist display on small screen	2020-06-12 15:05:12 +02:00
gaelle morin	fb8e923ec9	bugfix: left-menu responsive + button responsive	2020-06-12 12:19:45 +02:00
gaelle morin	c09cc4e525	bugfix: multiple fixes	2020-06-11 15:20:20 +02:00
maxime_senza	a772de30c1	Merge remote-tracking branch 'origin' into feature/job-board	2020-06-10 23:11:03 +02:00
gaelle morin	fbdd79ded5	Merge branch 'feature/utility-classes' of git.startinblox.com:applications/sib-app into feature/utility-classes	2020-06-10 17:49:25 +02:00
gaelle morin	2b49bc6eec	update: left-menu : hover removed	2020-06-10 16:37:48 +02:00
Jean-Baptiste Pasquier	c6dc4d8f93	Merge branch 'release/rework-css' into feature/utility-classes	2020-06-10 15:44:38 +02:00
gaelle morin	a468fe2377	update: height of pages + bug on project edit form	2020-06-10 15:36:45 +02:00
gaelle morin	213c6a78ab	update: table - some padding added to user-thulb in table + new width for table's columns	2020-06-10 13:27:57 +02:00
gaelle morin	3629c0c20b	update: table - scrollvar ok	2020-06-10 12:22:22 +02:00
gaelle morin	e6d1ddc33c	update: table - responsive ok. Need rework of scroll bar and breakpoints	2020-06-10 11:25:36 +02:00
gaelle morin	cf080c7c71	update: table - responsive for project-edt and circle-edit	2020-06-10 01:09:30 +02:00
gaelle morin	741eff85ce	update: table - responsive for admin-project and project-edit (wip)	2020-06-10 00:59:45 +02:00
gaelle morin	7e655e054a	update: table - responsive for admin-user and admin-circle	2020-06-10 00:03:58 +02:00
Jean-Baptiste Pasquier	70fe2f3b7a	Merge branch 'master' into release/job-board	2020-06-09 17:34:10 +02:00
gaelle morin	74cec30974	update: circle-admin - leave and join button clickable	2020-06-09 16:51:15 +02:00
gaelle morin	d8879c4f12	update: table - wip	2020-06-09 15:32:00 +02:00
gaelle morin	5441686d8e	update: table - wip	2020-06-09 15:15:34 +02:00
gaelle morin	eaa7478196	update: better look of user panel on mobile	2020-06-09 12:10:13 +02:00
gaelle morin	57d775fa01	update: header + fix for webkit for mobile	2020-06-09 11:43:40 +02:00
maxime_senza	dfac59edc2	feature: add simple incon font script	2020-06-09 01:42:45 +02:00
Jean-Baptiste Pasquier	2d64060943	fix: sib-directory local path	2020-06-08 19:22:35 +00:00
Jean-Baptiste Pasquier	de36926b45	update: directory to 0.4	2020-06-08 19:55:28 +02:00
gaelle morin	58e2f3b2ea	update: user's panel responsive + height of chat view	2020-06-08 15:50:42 +02:00
gaelle morin	797728b743	update: sub-menu - is responsive	2020-06-05 15:44:15 +02:00
gaelle morin	2f3bdaa2e5	update: sidebar - access when in admin on mobile	2020-06-05 11:25:57 +02:00
gaelle morin	8f49cbdcd7	update: left-menu - responsive ok	2020-06-04 18:15:43 +02:00
gaelle morin	9d83093165	update: left-menu and header : ellipsis and alignment	2020-06-03 17:36:01 +02:00
Jean-Baptiste Pasquier	c856621bd8	fix: router magic	2020-06-03 13:43:14 +00:00
gaelle morin	898144fa9a	update: left-menu - ellipsis on large and small screens	2020-06-03 15:33:10 +02:00
gaelle morin	ec5326887e	update: left-menu - search input: positioning and width on small screens	2020-06-03 14:37:41 +02:00
gaelle morin	37a8e28793	update: header - responsive ok	2020-06-03 14:16:29 +02:00
gaelle morin	e266e5936e	update: left-menu - hover: comments + colors added	2020-06-03 10:31:45 +02:00
gaelle morin	db592c0dfd	update: left-menu - hover (need refactoring)	2020-06-02 19:03:31 +02:00
Jean-Baptiste Pasquier	bee847d888	fix: typo	2020-06-02 10:53:26 +00:00
Jean-Baptiste Pasquier	4a33ead577	update: add text to about	2020-06-02 10:43:00 +00:00
gaelle morin	9079b6c1c9	update: left-menu - hover (wip)	2020-06-02 09:29:42 +02:00
Jean-Baptiste Pasquier	701c06a556	fix: clean project and make it works	2020-06-01 17:29:30 +02:00
gaelle morin	1432011f34	update: responsive - general layout. Flex to grid	2020-06-01 17:11:24 +02:00
Jean-Baptiste Pasquier	3d860913a6	fix: profile url	2020-06-01 16:28:04 +02:00
maxime_senza	e7b4ba16a5	Merge branch 'feature/projects' of https://git.startinblox.com/applications/hubl into feature/projects	2020-06-01 16:24:27 +02:00
maxime_senza	a247792ed4	feature project : remove client and business profider fields in edition form	2020-06-01 16:24:05 +02:00
maxime_senza	65be45c777	feature: about sib - reduce padding size & add div in blocs	2020-06-01 16:14:00 +02:00
maxime_senza	cf166b71d7	feature: about sib | align center blocs & fix contact button	2020-06-01 16:05:23 +02:00
Jure Ursic	f8d875a590	update: removing conversationn dependency and adding rdf-type attribute	2020-06-01 15:48:26 +02:00
Jean-Baptiste Pasquier	4f351f37fb	remove useless style	2020-06-01 13:02:46 +02:00
Jean-Baptiste Pasquier	5c361bdef9	small fixes, remove tabs	2020-06-01 12:42:35 +02:00
maxime_senza	623c715892	feature : merge updates on master branch & add new class to about page	2020-05-30 10:43:13 +02:00
maxime_senza	fe6b8c903d	Merge remote-tracking branch 'origin' into feature/projects	2020-05-30 10:35:08 +02:00
maxime_senza	62b781ed28	feature: removing unwanted content && personnalizing content for FNK needs	2020-05-30 10:08:18 +02:00
gaelle morin	20e27997d6	fix: fix bugs due to merge	2020-05-29 18:12:29 +02:00
Jure Ursic	49791e1d37	fix: merge conflicts	2020-05-29 17:34:48 +02:00
Jure Ursic	a703671853	feature: job-board listing,, createand edit	2020-05-29 17:33:02 +02:00
gaelle morin	8087e679c8	bugfix : flex added in admin-users	2020-05-29 14:15:05 +02:00
gaelle morin	a87cdf59e1	bugfix : index - style corrected	2020-05-29 14:15:05 +02:00
gaelle morin	c53e65e4a6	bugfix : project-edit - style corrected	2020-05-29 14:15:05 +02:00
gaelle morin	ca845b6f6e	bugfix : circle-edit - style added	2020-05-29 14:15:05 +02:00
gaelle morin	c950cee5c9	bugfix : admin-project - style added	2020-05-29 14:15:05 +02:00
gaelle morin	f0b8d2b31e	bugfix : admin-project-create - .member-select removed	2020-05-29 14:15:05 +02:00
gaelle morin	b32cf018d5	bugfix : admin-circle-create - conflict resolved + accurate styles added + update of form.scss	2020-05-29 14:15:05 +02:00
gaelle morin	2cf65ddab7	bugfix : additional block deleted in circle-profile + hubl-groups removed (no need)	2020-05-29 14:15:05 +02:00
gaelle morin	e72b5693b4	upate: Style for sib-form-autocompletion > select added	2020-05-29 14:15:05 +02:00
gaelle morin	ff12a9d68c	upate: margin of fieldset resolved	2020-05-29 14:15:05 +02:00
gaelle morin	581d89709d	upate: .no-sidebar separated into .no-sidebar + .with-padding	2020-05-29 14:15:03 +02:00
gaelle morin	e26b5f45f5	bugfix: icon of join buttons are aligned	2020-05-29 14:09:42 +02:00
gaelle morin	99bafed78c	update: useless for filters and how-to buttons files deleted	2020-05-29 14:09:42 +02:00
gaelle morin	85f7dfcb62	update: Main header responsive: start	2020-05-29 14:09:42 +02:00
gaelle morin	5e33021818	update: .customer-logo moved to main.scss	2020-05-29 14:09:42 +02:00
gaelle morin	5d69d1a4ee	update: .position-end and box-button are in the same class	2020-05-29 14:09:42 +02:00
gaelle morin	c950d27d47	update: css for form elements are outside the .with-form context	2020-05-29 14:09:42 +02:00
gaelle morin	56f9151345	update: flex class added in other files + %padding removed	2020-05-29 14:09:29 +02:00
gaelle morin	af1d40cbd4	update: classes for avatar, logo and flex added + css for elements from main header are outside the styles for that header	2020-05-29 14:07:44 +02:00
gaelle morin	21d078bda9	update: label for form reviewed + class added for input	2020-05-29 14:07:44 +02:00
gaelle morin	80d3a22cf6	update: clean-up form css	2020-05-29 14:07:44 +02:00
gaelle morin	e79ddc3f37	update: clean-up form css	2020-05-29 14:07:44 +02:00
gaelle morin	f9300d2120	bugfix: buttons in circle-admin	2020-05-29 14:07:44 +02:00
gaelle morin	f01f00732c	update: main css clean up	2020-05-29 14:07:44 +02:00
gaelle morin	3b6121ace9	update: useless styles removed from project-profile	2020-05-29 14:07:44 +02:00
gaelle morin	23412b691f	admin-header css file removed	2020-05-29 14:07:44 +02:00
gaelle morin	c6e4325b34	update: h3 used instead of a class	2020-05-29 14:07:44 +02:00
gaelle morin	6fed12bc01	update: comments added to user-thumb	2020-05-29 14:07:44 +02:00
gaelle morin	6fefd17c9b	update: frameworkisation of user-thumb	2020-05-29 14:07:44 +02:00
gaelle morin	cf30a0e363	update: groups removed	2020-05-29 14:07:44 +02:00
gaelle morin	ef8ad357f7	update: header ok	2020-05-29 14:07:44 +02:00
gaelle morin	4862d25515	update: useless classes removed	2020-05-29 14:07:44 +02:00
gaelle morin	ffd384aa87	update: frameworkisation of forms	2020-05-29 14:07:44 +02:00
maxime_senza	b0be741980	add space betwween text and cta's	2020-05-29 10:16:53 +02:00
maxime_senza	bf2bddeb32	feature : css for about page : colors & make clean on mobile	2020-05-29 00:28:53 +02:00
maxime_senza	7725350ca1	feature: about sib : place import in clean spot of index	2020-05-28 23:49:46 +02:00
maxime_senza	3ca338e4c6	css for about page	2020-05-28 23:49:21 +02:00
maxime_senza	424b8338ef	feature: remove unwanted content & fix css for table	2020-05-28 23:17:16 +02:00
maxime_senza	5ce5f5523b	add css files for about page	2020-05-28 23:16:23 +02:00
maxime_senza	6ea07c6bc0	feature: classes for about page	2020-05-28 23:05:34 +02:00
maxime_senza	4148b8c6f0	feature: about page | change spot in header	2020-05-27 15:07:30 +02:00
Jean-Baptiste Pasquier	0987ba2fbb	fix: typo canal/cercle	2020-05-27 10:55:15 +00:00
maxime_senza	101617fed8	feature : project - remove unwanted fields from the creation form	2020-05-27 12:42:08 +02:00
maxime_senza	148992eaef	feature: about sib | HTML of page + header link + include + sib router	2020-05-27 11:17:44 +02:00
Jean-Baptiste Pasquier	4e2fccdb60	feature: my profile	2020-05-27 06:44:54 +00:00
Jure Ursic	2b4da0d09e	Merge branch 'master' of git.startinblox.com:applications/hubl	2020-05-21 15:26:43 +02:00
Jean-Baptiste Pasquier	f9653163ed	fix: MR155	2020-05-20 16:42:11 +02:00
Jean-Baptiste Pasquier	7c00d2391a	feature: status icon on left menu	2020-05-19 19:42:32 +02:00
Jean-Baptiste Pasquier	120af5b322	feature: add search bar	2020-05-19 19:09:59 +02:00
Jean-Baptiste Pasquier	9f32a4dc9b	feature: private circles	2020-05-19 18:22:00 +02:00
Jure Ursic	647a62bba7	update: removed not needed attribute on sib-directory	2020-05-14 15:03:08 +02:00
Jean-Baptiste Pasquier	beed19cb42	feature: css variables	2020-05-11 18:20:13 +00:00
Jean-Baptiste Pasquier	40792273fe	Fixes & Hubl branding	2020-05-08 13:27:44 +00:00
gaelle morin	851fb4104d	update: business provider template translated	2020-04-24 14:35:37 +00:00
gaelle morin	5fd9f9d39a	update: admninistrator tag tranlated	2020-04-24 14:35:37 +00:00
gaelle morin	baed5b7e27	feature: circle profile translated	2020-04-24 14:35:37 +00:00
gaelle morin	ae76214372	update: missing translation added	2020-04-24 14:35:37 +00:00
gaelle morin	08e03513ce	feature: project profile translated	2020-04-24 14:35:37 +00:00
Gaëlle Morin	49f95489bb	Update page-admin-users.pug	2020-04-24 14:35:37 +00:00
Gaëlle Morin	f91a1d6427	Update page-admin-users-edit.pug	2020-04-24 14:35:37 +00:00
Gaëlle Morin	f984113dd5	Update page-admin-users-edit.pug	2020-04-24 14:35:37 +00:00
Gaëlle Morin	3697e5be8b	Update page-admin-users-create.pug	2020-04-24 14:35:37 +00:00
gaelle morin	a603535a65	feature: left menu translated	2020-04-24 14:35:37 +00:00
gaelle morin	a8f1601777	feature: user menu translated	2020-04-24 14:35:37 +00:00
gaelle morin	35522b4cee	update: use inclusive writing	2020-04-24 14:35:37 +00:00
gaelle morin	5adf9c30ce	update: use inclusive writing	2020-04-24 14:35:37 +00:00
gaelle morin	2630441ee7	feature: edit a user translated	2020-04-24 14:35:37 +00:00
gaelle morin	3d2802ba05	feature: add a user translated	2020-04-24 14:35:37 +00:00
gaelle morin	ea082c16ba	feature: listing of users translated	2020-04-24 14:35:37 +00:00
gaelle morin	fac8d25c79	update: mispelling corrected	2020-04-24 14:35:37 +00:00
gaelle morin	574087cd10	feature: edit a circle translated	2020-04-24 14:35:37 +00:00
gaelle morin	86a4eb6b0b	feature: add a circle translated	2020-04-24 14:35:37 +00:00
gaelle morin	63c03b8105	feature: listing of circles translated	2020-04-24 14:35:37 +00:00
gaelle morin	cd8f4c18d9	update: inclusive writing removed	2020-04-24 14:35:37 +00:00
gaelle morin	e060e68323	feature: edit a project translated	2020-04-24 14:35:37 +00:00
gaelle morin	c3cce9a6ac	feature: add a project translated	2020-04-24 14:35:37 +00:00
gaelle morin	7ef4c1e484	feature: listing of projects translated	2020-04-24 14:35:37 +00:00
gaelle morin	cfa1efbdfa	feature: right menu of admin translated	2020-04-24 14:35:37 +00:00
gaelle morin	2d5055780c	feature: right menu of circles and projects translated	2020-04-24 14:35:37 +00:00
gaelle morin	905e00272e	feature: dashboard translated	2020-04-24 14:35:37 +00:00
Jean-Baptiste Pasquier	65f08ae339	Merge branch 'master' of git.startinblox.com:applications/sib-app into release/dashboard	2020-04-20 17:34:03 +02:00
Jean-Baptiste Pasquier	4f051b345d	fix: redirection and cache	2020-04-20 13:56:46 +02:00
gaelle morin	af63c6632f	fix: name for dashboard icon corrected	2020-04-17 16:23:53 +02:00
Jean-Baptiste Pasquier	4d47402c86	Merge branch 'feature/dashboard' of git.startinblox.com:applications/sib-app into feature/dashboard	2020-04-16 16:48:16 +02:00
Jean-Baptiste Pasquier	9b577fb894	Merge remote-tracking branch 'origin/bugfix/missing_content_login' into release/profile-directory	2020-04-16 14:39:54 +02:00
Jean-Baptiste Pasquier	7375322bfe	minor: setup sib app for dashboard component	2020-04-16 14:32:39 +02:00
Gaëlle Morin	92c8ace547	update: fix user admin icon	2020-04-16 14:30:31 +02:00
Jean-Baptiste Pasquier	019e8b99a6	feature: user administration	2020-04-16 14:30:31 +02:00
Gaëlle Morin	6c8224c0f2	update: clear unused and fixes CSS	2020-04-16 14:30:28 +02:00
gaelle morin	896bd2dc6c	update: some CSS added	2020-04-15 16:19:39 +02:00
gaelle morin	546ce765f5	update: new endpoint added	2020-04-15 16:13:11 +02:00
gaelle morin	55c8b2019c	update: wip on the 'Leave button'	2020-04-15 16:11:39 +02:00
gaelle morin	43d17d7b1c	update: test in dependencies	2020-04-15 16:11:35 +02:00
gaelle morin	9b9012f9a3	update: test to display the size and the content in the same element	2020-04-15 16:10:46 +02:00
Matthieu Fesselier	8c6daf097b	bugfix: wait for notification menu to add listener	2020-04-07 15:09:54 +02:00
Jean-Baptiste Pasquier	7026c0da49	minor: setup sib app for dashboard component	2020-04-07 13:35:54 +02:00
Jean-Baptiste Pasquier	e62d32e6ae	update: add Matomo and Google analytics + Rewrite readme for a complete configuration	2020-04-01 12:12:55 +02:00
Matthieu Fesselier	74a453d169	bugfix: remove extra-context	2020-03-20 14:48:56 +01:00
Matthieu Fesselier	dd6b2b9652	fix badges workaround	2020-03-12 09:11:47 +01:00
Matthieu Fesselier	6983039f9e	update: test badge removal	2020-03-12 08:53:39 +01:00
Jean-Baptiste Pasquier	1a0f0346ae	fix: hd-counter	2020-02-26 22:56:42 +01:00
Jean-Baptiste Pasquier	5f66a59c68	fix: badge url	2020-02-26 22:51:30 +01:00
Jean-Baptiste Pasquier	e1b64c152a	minor: upgrade to sib-chat@0.5 (converse in fullscreen)	2020-02-26 00:30:03 +01:00
gaelle morin	68961182ff	CSS fixup	2020-02-24 15:10:02 +01:00
Jean-Baptiste Pasquier	3e14cb91a4	update: redirect to login and hide page on logged out	2020-02-19 17:03:47 +01:00
Jean-Baptiste Pasquier	8042b179c6	fix: recursiveAdaptWidgets	2020-02-19 16:27:22 +01:00
Jean-Baptiste Pasquier	e1bce61124	perf: improve circle admin	2020-02-10 17:58:03 +01:00
Jean-Baptiste Pasquier	31bd34df98	sorted src, activate condition for public directory and job offers, dev parameter for local lib folder	2020-02-10 13:59:23 +01:00
Jean-Baptiste Pasquier	b512cf3e9a	Merge branch 'update-event' into 'staging' ... Update event See merge request startinblox/applications/sib-app!113	2020-02-10 12:22:53 +00:00
Calum Mackervoy	7f227bfc57	Refreshing sib-displays in absence of reactive store	2020-02-05 12:39:29 +00:00
Marjolaine Le Bon	815e5a69b5	ui : update fonts + colors	2020-02-04 15:27:13 +01:00
Marjolaine Le Bon	78637dea70	ui : update Fonts + colors	2020-02-04 13:38:28 +01:00
Marjolaine Le Bon	75d87bd632	init css file + font	2020-02-04 12:25:58 +01:00
Benoit Alessandroni	998fa6099e	Fixing upload dir	2020-02-03 18:01:04 +01:00
Benoit Alessandroni	d69fc976fc	Fixing arguments	2020-02-03 17:48:37 +01:00
Benoit Alessandroni	08e7d5f908	Fixing the event component declaration	2020-02-03 17:22:23 +01:00
Jean-Baptiste Pasquier	d5e19c469c	update: add events component	2020-02-03 15:43:16 +01:00
Jean-Baptiste Pasquier	0f43e021f2	fix: no endpoint for clientCSS	2020-02-03 14:47:58 +01:00
Jean-Baptiste Pasquier	7eff652d5d	Adapted Sib App for ETUC & more flexible way to handle optional components	2020-02-03 14:39:14 +01:00
Jean-Baptiste Pasquier	9562289e53	fix: css for left menu	2020-01-27 13:29:54 +01:00
Jean-Baptiste Pasquier	fb703e7246	fix: move next to parent	2020-01-27 13:18:28 +01:00
Jean-Baptiste Pasquier	7277983e08	fix: left menu circle on widget	2020-01-24 19:30:36 +01:00
Jean-Baptiste Pasquier	e4d9fae0f3	Merge branch 'staging' into circle-perf-fix	2020-01-24 17:58:43 +01:00
gaelle morin	3042c8efe2	project: admin tag displayed when it is needed + some CSS	2020-01-22 16:33:07 +01:00
Jean-Baptiste Pasquier	ae3d6cb282	try to set menu to user container	2020-01-20 14:35:09 +01:00
Jean-Baptiste Pasquier	83e6957934	fix a lot of problems and add js for menus	2020-01-20 13:57:03 +01:00
gaelle morin	36a045cacb	sidebar is responsive for the circles	2020-01-19 14:25:08 +01:00
gaelle morin	5a20cfe3a8	header is responsive	2020-01-19 13:57:34 +01:00
gaelle morin	3e281edc5c	Sidebar is responsive	2020-01-19 13:19:25 +01:00
gaelle morin	56953601e1	Left menu is responsive	2020-01-19 10:48:22 +01:00
gaelle morin	90a92cc832	scrollbars are customised	2020-01-18 21:43:41 +01:00
gaelle morin	cd9e478264	scrollbars on left menu and content added	2020-01-18 15:51:43 +01:00
gaelle morin	bf5a379b13	Merge branch 'edit-project-customer-dropdown' of git.happy-dev.fr:startinblox/applications/sib-app into gm-test-2	2020-01-18 12:17:57 +01:00
Jean-Baptiste Pasquier	29ce7cdfd0	fix: quickfix for client logo height	2020-01-16 20:56:54 +01:00
Jean-Baptiste Pasquier	cfac96b12a	fix: title from config.sjon	2020-01-16 20:51:54 +01:00
Jean-Baptiste Pasquier	9185793c04	fix: logo auto size	2020-01-16 20:50:20 +01:00
Jean-Baptiste Pasquier	a0cd6bb468	Merge branch 'staging' into 'parameters-on-sample-for-clients' ... # Conflicts: # src/menu-left.pug	2020-01-16 19:32:55 +00:00
Jean-Baptiste Pasquier	4cf9cce6ad	fix: add parameters on sample and var for logo	2020-01-16 20:31:28 +01:00
gaelle morin	b0e7584a07	css for project-edit added + refactoring	2020-01-16 18:48:21 +01:00
Calum Mackervoy	2209492836	fixed merge conflicts	2020-01-14 11:57:22 +01:00
Calum Mackervoy	6a0821a59b	customer dropdown for project create	2020-01-13 11:50:45 +01:00
Calum Mackervoy	e50845455b	customer dropdown in project-edit	2020-01-13 10:33:36 +01:00
Jean-Baptiste Pasquier	78532f230c	temporary removed project from menu	2020-01-10 16:43:05 +01:00
Calum Mackervoy	bb40beb449	customer dropdown in edit-project	2020-01-09 15:21:17 +01:00
Jean-Baptiste Pasquier	07abdce85c	Merge branch 'staging' into project-admin	2020-01-09 11:34:17 +01:00
Calum Mackervoy	c17912b03f	project team displaying is_admin and avatar correctly	2020-01-09 09:03:48 +00:00
Calum Mackervoy	1ae56e77cf	Don't display null customer details	2020-01-09 09:00:21 +00:00
gaelle morin	74fe061e9a	CSS: styles of table refactored	2020-01-08 17:29:23 +01:00
gaelle morin	5affa10a7c	admin-project: hashtag added to project's name	2020-01-08 11:10:42 +01:00
gaelle morin	52dc49fcd2	'fieldset' added to admin-project-create	2020-01-08 10:58:59 +01:00
gaelle morin	1ca894298e	admin-project: table ok + icon added in sidebar	2020-01-08 00:59:44 +01:00
gaelle morin	235d3f7f97	Merge branch 'project-admin' of git.happy-dev.fr:startinblox/applications/sib-app into project-admin	2020-01-06 17:54:41 +01:00
gaelle morin	ebfd1fe44b	admin-project-create: form stylized (part 1)	2020-01-06 17:40:58 +01:00
Jean-Baptiste Pasquier	d590632130	fix: left menu arrows	2020-01-06 15:00:40 +01:00
gaelle morin	4fb569b9ef	Left menu: css improved for the projects tab	2020-01-06 12:19:08 +01:00
Jean-Baptiste Pasquier	ef20af91dd	fix: remove members on project creation	2020-01-03 14:15:31 +01:00
Jean-Baptiste Pasquier	c493764d4d	fix: cancel src to user container for project and circles	2020-01-03 14:08:06 +01:00
Jean-Baptiste Pasquier	d0d5cd6403	fix: drive source file	2020-01-03 14:02:19 +01:00
Jean-Baptiste Pasquier	6f1dd7d66c	Merge branch 'staging' into 'project-admin' ... # Conflicts: # src/menu-left.pug # src/page-circle-profile.pug	2019-12-21 18:06:20 +00:00
Calum Mackervoy	f3890f49e0	avatar displayed correctly	2019-12-20 23:22:59 +00:00
Gaëlle Morin	2e7d8f5ec9	Gm fixbug	2019-12-20 15:29:05 +00:00
gaelle morin	7fae8e6387	feature: members' name of a project now displayed	2019-12-20 16:21:42 +01:00
Calum Mackervoy	65c6b77fbc	feature: admin of a circle displayed ... - CSS added - architecture reworked - new field 'is-admin' used - members field used instead of team field.	2019-12-20 16:18:58 +01:00
Jean-Baptiste Pasquier	87705111bc	Merge branch 'staging' into 'project-admin' ... # Conflicts: # src/menu-left.pug # src/page-project-profile.pug # src/page-project.pug	2019-12-19 13:14:34 +00:00
Gaëlle Morin	68335ab8d8	Gm fixbug	2019-12-19 13:10:09 +00:00
Jean-Baptiste Pasquier	e9a56086cb	fix: Image path fix	2019-12-18 20:46:01 +01:00
Gaëlle Morin	40e103fc00	feature: project-profile page ... - css added or reviewed - templates added or reviewed (customer, business provider, team) - modal added and stylised - routes reviewed - navbar reviewed (adapted according to the content of the main section - admin status added - new staging added.	2019-12-18 18:50:47 +00:00
Calum Mackervoy	9903df3018	added foaf:depiction to frontend context	2019-12-18 16:37:01 +00:00
Gaëlle Morin	40143009aa	admin-circles: buttons are centered with the right color	2019-12-16 10:48:05 +01:00
Gaëlle Morin	fa50142438	fix: overflow on menu and content	2019-12-12 17:57:05 +01:00
Jean-Baptiste Pasquier	752acbecae	fix: target user container on menu bar	2019-12-12 14:34:09 +01:00
Gaëlle Morin	9762f8b0f9	Left navbar: modifications according to the wireframe update	2019-12-12 12:51:04 +01:00
Jean-Baptiste Pasquier	13b24a2ee2	Merge branch 'staging' into project-admin	2019-12-10 16:04:55 +01:00
Jean-Baptiste Pasquier	db2985857e	bugfix: cancel 2ba08635 css changes	2019-12-10 15:56:06 +01:00
Jean-Baptiste Pasquier	d7b6b478cf	fix: remove team relation	2019-12-10 15:36:52 +01:00
Jean-Baptiste Pasquier	caad1f69bf	fix: target sib-ac-checker to members	2019-12-10 15:33:33 +01:00
Jean-Baptiste Pasquier	bc45d421f8	Merge branch 'feat/manager_deploy' into 'staging' ... Deploy sibapp with managers See merge request startinblox/applications/sib-app!74	2019-12-10 13:57:41 +00:00
Jean-Baptiste Pasquier	b20da1d5dd	Merge branch 'staging' into 'project-admin' ... # Conflicts: # src/menu-left.pug	2019-12-10 12:42:24 +00:00
Jean-Baptiste Pasquier	2ba086355e	Merge branch '169-project-name-on-2-lines' into 'staging' ... Resolve "Project name on 2 lines" See merge request startinblox/applications/sib-app!84	2019-12-10 10:53:27 +00:00
Jean-Baptiste Pasquier	a7a5555ad3	fix: resolve #311	2019-12-10 11:52:39 +01:00
Jean-Baptiste Pasquier	2e3be21cdc	update: adding project admin & creation	2019-12-09 18:23:47 +01:00
Jean-Baptiste Pasquier	49e8fe9fee	Merge branch 'staging' into feat/manager_deploy	2019-12-06 16:16:49 +01:00
Calum Mackervoy	ef256c70f4	external context instead of _ in name	2019-12-04 16:11:05 +01:00
Gaëlle Morin	4d40e538a2	modifications according to the changes in the wireframe	2019-12-04 14:53:18 +01:00
Calum Mackervoy	fa4a1f0b0e	fixed first name display in userDetails	2019-12-04 12:27:05 +01:00
Jean-Baptiste Pasquier	1b8f3e7b7f	update: fixes for development usage	2019-12-02 15:22:25 +01:00
Jean-Baptiste Pasquier	33e2278ffb	Merge branch 'feat/manager_deploy' of git.happy-dev.fr:startinblox/applications/sib-app into project-integration-manager	2019-12-02 14:04:28 +01:00
Gaëlle Morin	1ade7ded23	Left-nav bar: new styles + overflow and hovering to handle long names	2019-11-29 17:02:55 +01:00
Calum Mackervoy	d03e58932b	Circle edit redirect	2019-11-29 15:16:53 +00:00
Calum Mackervoy	d63ee9b6fb	Esc key close rightmenu	2019-11-25 18:54:54 +00:00
Jean-Baptiste Pasquier	ba942945f2	fix: admin panel is not coming soon!	2019-11-18 14:14:46 +01:00
Jean-Baptiste Pasquier	34247826b2	fix: context for jabberID	2019-11-15 17:13:17 +01:00
Jean-Baptiste Pasquier	27098f59c5	fix: context for jabberID	2019-11-15 16:51:22 +01:00
Jean-Baptiste Pasquier	150464dfc1	fix: context for jabberID	2019-11-15 16:50:20 +01:00
Jean-Baptiste Pasquier	6d70a9c11e	fix: conflicts with master	2019-11-15 13:22:09 +00:00
Calum Mackervoy	bbc4a9356c	added listener to close user control	2019-11-15 13:02:08 +00:00
Calum Mackervoy	89f62025b4	circles not collapsable ... in line with mockup	2019-11-15 12:29:41 +00:00
Jean-Baptiste Pasquier	0c3b74bcaf	update: making join leave works	2019-11-14 13:27:04 +01:00
Gaëlle Morin	a342e5d431	hidden class added on sib-router	2019-11-13 15:23:54 +01:00
Gaëlle Morin	772e1e456b	Tables ok	2019-11-13 12:00:38 +01:00
Gaëlle Morin	03df657caf	full css rework on tables. Need refactor	2019-11-12 23:16:56 +01:00
Jean-Baptiste Pasquier	30de8eed82	fix: @gaelle target wrong class	2019-11-12 13:25:39 +01:00
Jean-Baptiste Pasquier	809978ecc8	fix: last one @gaelle	2019-11-12 13:22:23 +01:00
Jean-Baptiste Pasquier	8784ae7641	fix: selector for admin css	2019-11-12 13:13:52 +01:00
Jean-Baptiste Pasquier	aa46aeed78	fix: clear cache	2019-11-12 12:49:12 +01:00
Jean-Baptiste Pasquier	0566f34ec4	fix: @gaelle	2019-11-12 12:34:33 +01:00
Jean-Baptiste Pasquier	e60c6d6d1f	fix: @gaelle	2019-11-12 12:31:06 +01:00
Jean-Baptiste Pasquier	9795498944	fix: selector @gaelle	2019-11-12 12:26:34 +01:00
Gaëlle Morin	1eb83f2a80	match the mock-ups ok	2019-11-11 11:50:10 +01:00
Gaëlle Morin	5da381ce93	circle-create form ok	2019-11-11 11:22:37 +01:00
Gaëlle Morin	493a1a8525	rework on table with 2 columns: flex to grid + wip on the column for buttons in the 3-col table	2019-11-09 14:33:02 +01:00
Gaëlle Morin	62bb5a7fff	Clean-up circle-profile.scss	2019-11-08 13:26:00 +01:00
Gaëlle Morin	e274ad20d1	Clean-up circle-edit.scss	2019-11-08 12:52:41 +01:00
Gaëlle Morin	f3409274ee	Clean-up circle-admin.scss	2019-11-08 12:36:56 +01:00
Gaëlle Morin	52377dc92a	Clean-up main.scss	2019-11-08 11:34:30 +01:00
Gaëlle Morin	70e238d230	admin-circle table: wip => problem with multiple-members	2019-11-07 18:04:01 +01:00
Gaëlle Morin	2b4e256f98	mistake on icon fixed	2019-11-07 12:07:43 +01:00
Gaëlle Morin	d24bb94367	Merge branch 'circle-css' of git.happy-dev.fr:startinblox/applications/sib-app into circle-css	2019-11-07 12:06:07 +01:00
Gaëlle Morin	4a8f76c646	new icon for circle-admin added	2019-11-07 12:05:17 +01:00
Jean-Baptiste Pasquier	c1c46722da	fix: sib-router hidden on circle-profile	2019-11-06 20:44:22 +00:00
Gaëlle Morin	6ba3ef525d	fix bug on field alignment + buttons in admin ok	2019-11-06 21:28:25 +01:00
Gaëlle Morin	d4b4a176cd	creation date and edit button: OK + form's save button ok	2019-11-06 18:44:02 +01:00
Gaëlle Morin	d9db053ed2	edit: leave button => ok	2019-11-06 15:48:33 +01:00
Gaëlle Morin	b5dbbf7384	creation date and edit button wip	2019-11-06 15:44:53 +01:00
Gaëlle Morin	db352b31fc	button 'edit and add member' ok	2019-11-06 11:18:59 +01:00
Gaëlle Morin	b4911cfbb9	buttons 'join, leave, delete circle' ok + button to add member ok	2019-11-06 10:46:09 +01:00
Gaëlle Morin	372ee5c6e8	sidebar corrected	2019-11-05 19:58:40 +01:00
Jean-Baptiste Pasquier	3c7700e966	update: semantic css for buttons	2019-11-05 16:52:34 +00:00
Gaëlle Morin	3b49ddadee	ok title + button.	2019-11-05 15:00:10 +01:00
Gaëlle Morin	12ffa2467a	create circle button ok	2019-11-04 15:12:11 +01:00
Gaëlle Morin	ff2b07afb4	buttons centered	2019-11-04 14:34:03 +01:00
Gaëlle Morin	2661be13b6	styles for admins ok. Need padding ? + refactoring	2019-11-04 14:14:19 +01:00
plup	3a321c2b00	feature: imported webpack template	2019-11-03 17:22:37 +01:00
Gaëlle Morin	57045b44e3	create-circle: table-headers ok	2019-10-30 16:42:51 +01:00
Gaëlle Morin	2c4ce4127b	create-button ok	2019-10-30 15:29:23 +01:00
Gaëlle Morin	db7b1116c3	circle-admin: header ok	2019-10-30 14:34:34 +01:00
Gaëlle Morin	fda9e3dd22	circle-info buttons styled + form buttons refactored	2019-10-30 11:47:39 +01:00
Jean-Baptiste Pasquier	4aa69a1605	update: simplify dom for circles	2019-10-29 15:48:37 +01:00
Jean-Baptiste Pasquier	c50e05530e	fix: js recursive parent selector for admin	2019-10-29 15:38:33 +01:00
Jean-Baptiste Pasquier	5adbd98f51	fix: path template & js leave button	2019-10-29 15:15:02 +01:00
Jean-Baptiste Pasquier	7e0653f14b	Merge branch 'jbpasquier/circle-information' into circle-wip-merge	2019-10-29 15:03:48 +01:00
Jean-Baptiste Pasquier	3c72a4fee0	update: user avatar on admin	2019-10-29 14:59:57 +01:00
Gaëlle Morin	a80ce71399	merge conflict	2019-10-29 14:58:48 +01:00
Gaëlle Morin	250ad6c395	fix add member button (need refactoring)	2019-10-29 14:48:53 +01:00
Jean-Baptiste Pasquier	a5a63bd162	Merge branch 'circle-admin' into circle-wip-merge	2019-10-29 14:43:37 +01:00
Jean-Baptiste Pasquier	40eeef9d44	fix: account context	2019-10-29 14:38:59 +01:00
Christophe Henry	5eb9b6aad8	feat: add template for circle admin page	2019-10-29 14:22:42 +01:00
Gaëlle Morin	1489f1b1cb	edit button ok	2019-10-29 13:34:29 +01:00
Gaëlle Morin	27bea38d88	description field removed from page	2019-10-29 11:33:27 +01:00
Gaëlle Morin	71dc40a7f4	header modified: dash and description added	2019-10-29 11:33:26 +01:00
Jean-Baptiste Pasquier	7a24d37d8f	fix: creation date issue	2019-10-29 11:33:26 +01:00
Jean-Baptiste Pasquier	6803b965fb	fix: add bug info with issue link	2019-10-29 11:32:44 +01:00
Jean-Baptiste Pasquier	cb22295aa6	update: add administration & circle creation	2019-10-29 11:32:36 +01:00
Jean-Baptiste Pasquier	9db2e1b99b	update: Cleanup circle information	2019-10-29 11:31:48 +01:00
Gaëlle Morin	2334098e31	description field removed from page	2019-10-28 18:40:50 +01:00
Gaëlle Morin	30ce7d3bfd	header modified: dash and description added	2019-10-28 18:38:14 +01:00
Gaëlle Morin	6139c5df19	fix: double vertical scrollbar on chat fixed	2019-10-28 16:28:09 +01:00
Christophe Henry	fc7732b1b9	feat: add circles display	2019-10-28 15:44:55 +01:00
Gaëlle Morin	af0db1462e	name + owner displayed	2019-10-28 15:44:55 +01:00
Gaëlle Morin	9489fece13	route for circle admin ok	2019-10-28 15:44:55 +01:00
Jean-Baptiste Pasquier	d08153c797	fix: creation date issue	2019-10-28 13:55:43 +01:00
Jean-Baptiste Pasquier	4de5229960	fix: css merge	2019-10-25 19:25:06 +02:00
Jean-Baptiste Pasquier	e56a65a0cd	fix: add bug info with issue link	2019-10-25 19:17:48 +02:00
Jean-Baptiste Pasquier	09f35bd3c0	update: add administration & circle creation	2019-10-25 19:15:45 +02:00
Jean-Baptiste Pasquier	1c2789812e	Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/admin	2019-10-25 19:08:54 +02:00
Gaëlle Morin	1170e8b619	fix: CSS fix on circle-edit page	2019-10-25 18:20:48 +02:00
Jean-Baptiste Pasquier	d4279b0c7a	update: Cleanup circle information	2019-10-25 15:35:14 +02:00