Commit Graph

521 Commits

Author SHA1 Message Date
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
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
Gaëlle Morin
a7faff9b88 members block OK + delete-circle button added 2019-10-22 15:50:15 +02:00
Gaëlle Morin
3940bafda3 wip 2019-10-21 15:38:49 +02:00
Gaëlle Morin
afa5fa0451 new architecture for member list yeah 2019-10-21 15:02:12 +02:00
Gaëlle Morin
6d4b863e3b delete button ok 2019-10-21 13:12:04 +02:00
Gaëlle Morin
795bdb11e8 wip on owner dropdown 2019-10-21 11:37:07 +02:00
Gaëlle Morin
57885c6655 wip 2019-10-18 15:39:56 +02:00
Gaëlle Morin
ba6e21a71c wip 2019-10-18 10:26:08 +02:00
Gaëlle Morin
4d2566abe0 wip table 2019-10-17 16:06:22 +02:00
Jean-Baptiste Pasquier
61be5d780c
fix: empty circles/projects for anonymous 2019-10-16 18:28:19 +02:00
Jean-Baptiste Pasquier
dda3ecfa46
update: add context (LDFlex needing) 2019-10-16 17:10:00 +02:00
Jean-Baptiste Pasquier
b71d79e608 Merge branch '145' into 'staging'
Solves #145: add project captains to project page

See merge request startinblox/applications/sib-app!68
2019-10-16 13:22:06 +00:00
Christophe Henry
1a3aac00c8 Solves #145: add project captains to project page 2019-10-16 15:08:59 +02:00
Jean-Baptiste Pasquier
21d485c492
fix: _ & LDFlex on header 2019-10-16 13:21:23 +02:00
Jean-Baptiste Pasquier
da56c3a003
update: menu filtered for projects 2019-10-16 12:56:33 +02:00
Jean-Baptiste Pasquier
5c89cb116d
update: versions to 0.9 (missing notification) 2019-10-16 12:40:01 +02:00
Gaëlle Morin
456580aa3c sib-form ok. Need work on the team edition 2019-10-15 17:10:16 +02:00
Jean-Baptiste Pasquier
97af8eb377
Merge branch 'master' into staging 2019-10-15 15:52:41 +02:00
Christophe Henry
4ded6401d0 bugfix: add client name to sib-auth-provider's dataset (startinblox/applications/sib-app#224) 2019-10-15 15:49:53 +02:00
Gaëlle Morin
feadf0e275 wip 2019-10-15 13:54:06 +02:00
Gaëlle Morin
e32b8aa4b7 wip 2019-10-15 12:14:54 +02:00
Gaëlle Morin
2bbe3134db sib-core 0.9 2019-10-15 11:37:57 +02:00
Jean-Baptiste Pasquier
93895d166f
update: resolve !150 2019-10-02 16:56:49 +02:00
Jean-Baptiste Pasquier
c72ff3f6c1
update: sib-chat@0.3 2019-09-30 16:34:06 +02:00
Gaëlle Morin
bd7d3977d5 feature: left-menu display a message when no circle existing 2019-09-26 16:28:36 +02:00
Gaëlle Morin
06db2b185f fix: textarea too high when chatting with SO fixed 2019-09-23 17:02:18 +02:00
plup
6a7edb1a6c feature: removed specific configuration 2019-09-17 15:39:08 -04:00
Gaëlle Morin
9ef9208eea ffeature: circle's name displayed 2019-09-17 18:09:59 +02:00
Gaëlle Morin
9945747452 fix: Firefox 69 disclosure triangle masked 2019-09-06 13:34:55 +02:00
Jean-Baptiste Pasquier
2976f8d686
fix: typo 2019-09-03 16:58:29 +02:00
Jean-Baptiste Pasquier
d59d335426
fix: remove unused dependencies 2019-08-26 12:53:57 +02:00
Jean-Baptiste Pasquier
72a519e562 fix: order of circles & users 2019-08-26 10:34:33 +00:00
Gaëlle Morin
4750bdea61 ui: members page responsive 2019-08-19 14:12:12 +02:00
Jean-Baptiste Pasquier
582219cfd2
update: remove client_id from sample 2019-08-16 17:48:51 +02:00
Jean-Baptiste Pasquier
1b69319ce9
fix: chat works 2019-08-09 16:01:06 +02:00
Jean-Baptiste Pasquier
5fb9545e5c
update: remove menu 2019-08-08 16:00:16 +02:00
Jean-Baptiste Pasquier
4e09bb1c52
downgrade: keep only circle, oidc and users 2019-08-08 15:20:31 +02:00
Gaëlle Morin
8f11703fac fix: data-src corrected on project-edit 2019-08-06 16:13:33 +02:00
Gaëlle Morin
b2e2530800 ui: project-edit page enhanced + new CSS styles 2019-08-06 14:32:55 +02:00
Jean-Baptiste Pasquier
49456ea6a5
fix: small css fix 2019-08-02 17:04:25 +02:00
Jean-Baptiste Pasquier
4ad2b05682 Merge branch 'staging' into 'migrate-0.8'
# Conflicts:
#   src/dependencies.pug
#   src/scripts/index.js
2019-07-29 15:26:10 +00:00
Jean-Baptiste Pasquier
48ee36d13d
update: sib-chat@0.2 2019-07-29 14:41:05 +02:00
Jean-Baptiste Pasquier
2433e71d44
update: WIP sib-core 0.8 2019-07-23 15:08:59 +02:00
Gaëlle Morin
6309b20b65 update: default avatar
- .svg file is used
- new styles added
2019-07-20 01:08:54 +02:00
Gaëlle Morin
ce77303348 feature: sib-conversation added
- job-board updated with sib-conversation
- counter for the number of comments added
- new styles added
2019-07-18 09:55:47 +02:00
Gaëlle Morin
738eff4760 update: CSS refactoring 2019-06-27 17:16:50 +02:00
Jean-Baptiste Pasquier
0b0314dc3c feature: Header dropdown & css 2019-06-26 19:15:05 +02:00
Gaëlle Morin
ba01623195 feature: profile edition added
- new page created
- new route added
- some styles are reworked
- new styles added
2019-06-26 19:15:05 +02:00
Jean-Baptiste Pasquier
2ce14a72eb
fix: css badge 2019-06-25 10:25:43 +02:00
Jean-Baptiste Pasquier
a4b2e8d593
fix: css badge 2019-06-25 10:19:26 +02:00
Jean-Baptiste Pasquier
56d8f2e76a
fix: skills url on job board edit 2019-06-24 14:03:39 +02:00
Gaëlle Morin
acbf7cdbd7 Merge branch 'jbpasquier/endpoints' into 'staging'
feature: endpoints in config

See merge request startinblox/applications/sib-app!51
2019-06-24 12:00:24 +00:00
Jean-Baptiste Pasquier
539b297417
feature: endpoints in config 2019-06-24 13:56:49 +02:00
Gaëlle Morin
9d6758fe67 feature: possibility to update a job offer, added 2019-06-24 12:15:23 +02:00
Gaëlle Morin
926352b191 update(job-offer-create): css improved 2019-06-21 13:07:33 +02:00
Gaëlle Morin
54535c4007 ui(job-offer-create): new fields added
- Date field added
- New multiple select
- All css stykes for form reviewed
2019-06-19 16:07:42 +02:00
Gaëlle Morin
7880c62f61 feature(job-offers): sib-job-board component added
job-offers pug, css and dependancies file are updated.
2019-06-11 11:01:57 +02:00
Gaëlle Morin
f0d199ba95 ui(left-menu): active style on childs of submenus added 2019-06-07 23:13:47 +02:00
Gaëlle Morin
77dd8931f2 ui(job-offer-create): CSS on form + multiple-select reviewed 2019-06-06 15:10:06 +02:00
Gaëlle Morin
6ba87b0d27 Merge branch 'jbpasquier/badge-notifications' into 'staging'
feature: sib-badge for users messages

See merge request startinblox/applications/sib-app!43
2019-06-05 11:51:24 +00:00
Gaëlle Morin
63807e9a6d Merge branch 'jbpasquier/project-drive' into 'staging'
feature: add drive on project

See merge request startinblox/applications/sib-app!40
2019-06-05 11:48:41 +00:00
Jean-Baptiste Pasquier
54c8dda717 Sometimes git smoke something illicit. Fixed. 2019-06-05 11:46:32 +00:00
Jean-Baptiste Pasquier
522237b4d2
ui: hide or show login button 2019-06-05 13:26:58 +02:00
Jean-Baptiste Pasquier
de6217dd2d
feature: update sib-display on form save 2019-06-05 13:26:10 +02:00