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 |
|
Jean-Baptiste Pasquier
|
8e7547d06b
|
fix: fixing sib-ac-checker
|
2019-10-24 22:26:47 +02:00 |
|
Jean-Baptiste Pasquier
|
48075b2419
|
update: imbricate edit in profile & fix css
|
2019-10-24 22:03:15 +02:00 |
|
Jean-Baptiste Pasquier
|
9e3dc8fe8c
|
fix: edit template dup name
|
2019-10-24 21:44:35 +02:00 |
|
Jean-Baptiste Pasquier
|
7086dbd931
|
Merge branch '201-right-column-missing-on-the-circles' of git.happy-dev.fr:startinblox/applications/sib-app into gm-missing-edit-circle
|
2019-10-24 21:44:14 +02:00 |
|
Jean-Baptiste Pasquier
|
e1ec289f61
|
Merge branch 'gm-missing-edit-circle' of git.happy-dev.fr:startinblox/applications/sib-app into gm-missing-edit-circle
|
2019-10-24 21:24:10 +02:00 |
|
Jean-Baptiste Pasquier
|
a4314210b4
|
update: working form + back link
|
2019-10-24 21:23:11 +02:00 |
|
Jean-Baptiste Pasquier
|
a71fbf1b78
|
Merge branch 'staging' into gm-missing-edit-circle
|
2019-10-24 16:22:06 +02:00 |
|
Gaëlle Morin
|
bf2b89d6d4
|
sib link
|
2019-10-24 14:53:29 +02:00 |
|
Gaëlle Morin
|
b18fb237f2
|
delete former route
|
2019-10-24 11:22:38 +02:00 |
|
Gaëlle Morin
|
67697ab03d
|
route for edit ok
|
2019-10-24 11:21:35 +02:00 |
|
Gaëlle Morin
|
5a865693a1
|
feature: new page to display info about a circle and add members
- New styles for "add users" drodown
- New custom widget to display members
- Use of the permission system
|
2019-10-23 22:20:59 +02:00 |
|