Commit Graph

673 Commits

Author SHA1 Message Date
Jean-Baptiste Pasquier
e4d9fae0f3
Merge branch 'staging' into circle-perf-fix 2020-01-24 17:58:43 +01:00
Jean-Baptiste Pasquier
f9e9a5d75e Merge branch 'gm-admin-tag-fix' into 'staging'
project: admin tag displayed when it is needed + some CSS

See merge request startinblox/applications/sib-app!107
2020-01-22 15:36:16 +00:00
gaelle morin
3042c8efe2
project: admin tag displayed when it is needed + some CSS 2020-01-22 16:33:07 +01:00
Jean-Baptiste Pasquier
ae3d6cb282
try to set menu to user container 2020-01-20 14:35:09 +01:00
Jean-Baptiste Pasquier
541ace4e3f Merge branch 'responsive-fix' into 'staging'
Responsive fixes

See merge request startinblox/applications/sib-app!106
2020-01-20 12:59:02 +00:00
Jean-Baptiste Pasquier
83e6957934
fix a lot of problems and add js for menus 2020-01-20 13:57:03 +01:00
gaelle morin
36a045cacb
sidebar is responsive for the circles 2020-01-19 14:25:08 +01:00
gaelle morin
5a20cfe3a8
header is responsive 2020-01-19 13:57:34 +01:00
gaelle morin
3e281edc5c
Sidebar is responsive 2020-01-19 13:19:25 +01:00
gaelle morin
56953601e1
Left menu is responsive 2020-01-19 10:48:22 +01:00
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
2485e00aff Merge branch 'parameters-on-sample-for-clients' into 'staging'
Parameters on sample for clients

See merge request startinblox/applications/sib-app!103
2020-01-16 19:33:11 +00: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
7b1eab139e Merge branch 'project-admin' into 'staging'
Project admin listing & project creation

See merge request startinblox/applications/sib-app!88
2020-01-10 19:59:38 +00: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
Jean-Baptiste Pasquier
9ad8126311 Merge branch 'project-admin-display' into 'staging'
project team displaying is_admin and avatar correctly

See merge request startinblox/applications/sib-app!98
2020-01-09 09:03:48 +00:00
Calum Mackervoy
c17912b03f project team displaying is_admin and avatar correctly 2020-01-09 09:03:48 +00:00
Jean-Baptiste Pasquier
29dbd1f649 Merge branch 'customer-null-values' into 'staging'
Don't display null customer details

See merge request startinblox/applications/sib-app!96
2020-01-09 09:00:21 +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
Jean-Baptiste Pasquier
7c26bc5f6d Merge branch 'circle-members-avatar' into 'staging'
avatar displayed correctly

See merge request startinblox/applications/sib-app!97
2019-12-20 23:22:59 +00:00
Calum Mackervoy
f3890f49e0 avatar displayed correctly 2019-12-20 23:22:59 +00:00
Jean-Baptiste Pasquier
5fff6e286a Merge branch 'gm-fixbug' into 'staging'
Gm fixbug

See merge request startinblox/applications/sib-app!95
2019-12-20 15:29:05 +00:00
Gaëlle Morin
2e7d8f5ec9 Gm fixbug 2019-12-20 15:29:05 +00:00
Jean-Baptiste Pasquier
17d2cd3137 Merge branch 'circle-admin-role' into 'staging'
Circle admin role

See merge request startinblox/applications/sib-app!89
2019-12-20 15:28:33 +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