autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
663 Commits 1 Branch 0 Tags 6.4 MiB
90a92cc832
Commit Graph

484 Commits

Author SHA1 Message Date
gaelle morin
90a92cc832
scrollbars are customised 2020-01-18 21:43:41 +01:00
gaelle morin
cd9e478264
scrollbars on left menu and content added 2020-01-18 15:51:43 +01:00
gaelle morin
bf5a379b13
Merge branch 'edit-project-customer-dropdown' of git.happy-dev.fr:startinblox/applications/sib-app into gm-test-2 2020-01-18 12:17:57 +01:00
Jean-Baptiste Pasquier
29ce7cdfd0
fix: quickfix for client logo height 2020-01-16 20:56:54 +01:00
Jean-Baptiste Pasquier
cfac96b12a
fix: title from config.sjon 2020-01-16 20:51:54 +01:00
Jean-Baptiste Pasquier
9185793c04
fix: logo auto size 2020-01-16 20:50:20 +01:00
Jean-Baptiste Pasquier
a0cd6bb468 Merge branch 'staging' into 'parameters-on-sample-for-clients' 
# Conflicts:
#   src/menu-left.pug
 2020-01-16 19:32:55 +00:00
Jean-Baptiste Pasquier
4cf9cce6ad
fix: add parameters on sample and var for logo 2020-01-16 20:31:28 +01:00
gaelle morin
b0e7584a07
css for project-edit added + refactoring 2020-01-16 18:48:21 +01:00
Calum Mackervoy
2209492836 fixed merge conflicts 2020-01-14 11:57:22 +01:00
Calum Mackervoy
6a0821a59b customer dropdown for project create 2020-01-13 11:50:45 +01:00
Calum Mackervoy
e50845455b customer dropdown in project-edit 2020-01-13 10:33:36 +01:00
Jean-Baptiste Pasquier
78532f230c
temporary removed project from menu 2020-01-10 16:43:05 +01:00
Calum Mackervoy
bb40beb449 customer dropdown in edit-project 2020-01-09 15:21:17 +01:00
Jean-Baptiste Pasquier
07abdce85c
Merge branch 'staging' into project-admin 2020-01-09 11:34:17 +01:00
Calum Mackervoy
c17912b03f project team displaying is_admin and avatar correctly 2020-01-09 09:03:48 +00:00
Calum Mackervoy
1ae56e77cf Don't display null customer details 2020-01-09 09:00:21 +00:00
gaelle morin
74fe061e9a
CSS: styles of table refactored 2020-01-08 17:29:23 +01:00
gaelle morin
5affa10a7c
admin-project: hashtag added to project's name 2020-01-08 11:10:42 +01:00
gaelle morin
52dc49fcd2
'fieldset' added to admin-project-create 2020-01-08 10:58:59 +01:00
gaelle morin
1ca894298e
admin-project: table ok + icon added in sidebar 2020-01-08 00:59:44 +01:00
gaelle morin
235d3f7f97
Merge branch 'project-admin' of git.happy-dev.fr:startinblox/applications/sib-app into project-admin 2020-01-06 17:54:41 +01:00
gaelle morin
ebfd1fe44b
admin-project-create: form stylized (part 1) 2020-01-06 17:40:58 +01:00
Jean-Baptiste Pasquier
d590632130
fix: left menu arrows 2020-01-06 15:00:40 +01:00
gaelle morin
4fb569b9ef
Left menu: css improved for the projects tab 2020-01-06 12:19:08 +01:00
Jean-Baptiste Pasquier
ef20af91dd
fix: remove members on project creation 2020-01-03 14:15:31 +01:00
Jean-Baptiste Pasquier
c493764d4d
fix: cancel src to user container for project and circles 2020-01-03 14:08:06 +01:00
Jean-Baptiste Pasquier
d0d5cd6403
fix: drive source file 2020-01-03 14:02:19 +01:00
Jean-Baptiste Pasquier
6f1dd7d66c Merge branch 'staging' into 'project-admin' 
# Conflicts:
#   src/menu-left.pug
#   src/page-circle-profile.pug
 2019-12-21 18:06:20 +00:00
Calum Mackervoy
f3890f49e0 avatar displayed correctly 2019-12-20 23:22:59 +00:00
Gaëlle Morin
2e7d8f5ec9 Gm fixbug 2019-12-20 15:29:05 +00:00
gaelle morin
7fae8e6387
feature: members' name of a project now displayed 2019-12-20 16:21:42 +01:00
Calum Mackervoy
65c6b77fbc
feature: admin of a circle displayed 
- CSS added
- architecture reworked
- new field 'is-admin' used
- members field used instead of team field.
 2019-12-20 16:18:58 +01:00
Jean-Baptiste Pasquier
87705111bc Merge branch 'staging' into 'project-admin' 
# Conflicts:
#   src/menu-left.pug
#   src/page-project-profile.pug
#   src/page-project.pug
 2019-12-19 13:14:34 +00:00
Gaëlle Morin
68335ab8d8 Gm fixbug 2019-12-19 13:10:09 +00:00
Jean-Baptiste Pasquier
e9a56086cb
fix: Image path fix 2019-12-18 20:46:01 +01:00
Gaëlle Morin
40e103fc00 feature: project-profile page 
- css added or reviewed
- templates added or reviewed (customer, business provider, team)
- modal added and stylised
- routes reviewed
- navbar reviewed (adapted according to the content of the main section
- admin status added
- new staging added.
 2019-12-18 18:50:47 +00:00
Calum Mackervoy
9903df3018 added foaf:depiction to frontend context 2019-12-18 16:37:01 +00:00
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
Jean-Baptiste Pasquier
752acbecae
fix: target user container on menu bar 2019-12-12 14:34:09 +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
13b24a2ee2
Merge branch 'staging' into project-admin 2019-12-10 16:04:55 +01:00
Jean-Baptiste Pasquier
db2985857e
bugfix: cancel 2ba08635 css changes 2019-12-10 15:56:06 +01:00
Jean-Baptiste Pasquier
d7b6b478cf
fix: remove team relation 2019-12-10 15:36:52 +01:00
Jean-Baptiste Pasquier
caad1f69bf
fix: target sib-ac-checker to members 2019-12-10 15:33:33 +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
b20da1d5dd Merge branch 'staging' into 'project-admin' 
# Conflicts:
#   src/menu-left.pug
 2019-12-10 12:42:24 +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