Jean-Baptiste Pasquier
|
150464dfc1
|
fix: context for jabberID
|
2019-11-15 16:50:20 +01:00 |
|
Jean-Baptiste Pasquier
|
bae6838ca4
|
Merge branch 'collapse-user-control' into 'circle-css'
added listener to collapse user control
See merge request startinblox/applications/sib-app!79
|
2019-11-15 13:02:08 +00:00 |
|
Calum Mackervoy
|
bbc4a9356c
|
added listener to close user control
|
2019-11-15 13:02:08 +00:00 |
|
Jean-Baptiste Pasquier
|
f3381ba8da
|
Merge branch 'circles-admin-page' into 'circle-css'
Link to circles admin page
See merge request startinblox/applications/sib-app!78
|
2019-11-15 12:29:41 +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 |
|
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 |
|