Commit Graph

506 Commits

Author SHA1 Message Date
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
Jean-Baptiste Pasquier c53f4c8d94 Merge branch 'gm-fix-scrollbar' into 'staging'
fix: double vertical scrollbar erased

See merge request startinblox/applications/sib-app!75
2019-10-28 17:08:23 +00: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
Jean-Baptiste Pasquier 81d885730d Merge branch 'gm-css-fixup' into 'staging'
fix: CSS fix on circle-edit page

See merge request startinblox/applications/sib-app!73
2019-10-25 16:24:43 +00: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 65691721d2 Merge branch 'gm-missing-edit-circle' into 'staging'
Resolve "Missing edit circle"

See merge request startinblox/applications/sib-app!71
2019-10-24 20:05:50 +00: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
Gaëlle Morin 45064062fd wip 2019-10-23 13:55:42 +02:00
Gaëlle Morin 397e0a4dc3 wip 2019-10-23 09:57:34 +02:00