Commit Graph

440 Commits

Author SHA1 Message Date
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
Gaëlle Morin
9762f8b0f9 Left navbar: modifications according to the wireframe update 2019-12-12 12:51:04 +01:00
Jean-Baptiste Pasquier
db2985857e
bugfix: cancel 2ba08635 css changes 2019-12-10 15:56:06 +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
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
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