c17912b03f
project team displaying is_admin and avatar correctly
2020-01-09 09:03:48 +00:00
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
1ae56e77cf
Don't display null customer details
2020-01-09 09:00:21 +00:00
74fe061e9a
CSS: styles of table refactored
2020-01-08 17:29:23 +01:00
5affa10a7c
admin-project: hashtag added to project's name
2020-01-08 11:10:42 +01:00
52dc49fcd2
'fieldset' added to admin-project-create
2020-01-08 10:58:59 +01:00
1ca894298e
admin-project: table ok + icon added in sidebar
2020-01-08 00:59:44 +01:00
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
ebfd1fe44b
admin-project-create: form stylized (part 1)
2020-01-06 17:40:58 +01:00
d590632130
fix: left menu arrows
2020-01-06 15:00:40 +01:00
4fb569b9ef
Left menu: css improved for the projects tab
2020-01-06 12:19:08 +01:00
ef20af91dd
fix: remove members on project creation
2020-01-03 14:15:31 +01:00
c493764d4d
fix: cancel src to user container for project and circles
2020-01-03 14:08:06 +01:00
d0d5cd6403
fix: drive source file
2020-01-03 14:02:19 +01:00
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
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
f3890f49e0
avatar displayed correctly
2019-12-20 23:22:59 +00:00
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
2e7d8f5ec9
Gm fixbug
2019-12-20 15:29:05 +00:00
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
7fae8e6387
feature: members' name of a project now displayed
2019-12-20 16:21:42 +01:00
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
92840cf8ff
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-19 14:19:40 +01:00
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
d441ebc80a
Merge branch 'gm-fixbug' into 'staging'
...
Gm fixbug
See merge request startinblox/applications/sib-app!94
2019-12-19 13:10:09 +00:00
68335ab8d8
Gm fixbug
2019-12-19 13:10:09 +00:00
2abfaf1572
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-19 10:54:29 +01:00
e9a56086cb
fix: Image path fix
2019-12-18 20:46:01 +01:00
300d8bbfbd
Merge branch 'project-info-page' into 'staging'
...
Project info page
See merge request startinblox/applications/sib-app!87
2019-12-18 18:50:47 +00:00
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
a2ff7358fd
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-18 18:28:34 +01:00
255083d2c1
Merge branch 'avatar-bug' into 'staging'
...
added foaf:depiction to frontend context
See merge request startinblox/applications/sib-app!93
2019-12-18 16:37:01 +00:00
9903df3018
added foaf:depiction to frontend context
2019-12-18 16:37:01 +00:00
b932d26db2
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-16 15:51:17 +01:00
b4dd622fc9
Merge branch '291-css-of-the-join-column-not-right-on-the-circles-administration-page' into 'staging'
...
Resolve "CSS of the "Join" column not right on the Circles administration page"
See merge request startinblox/applications/sib-app!85
2019-12-16 14:02:13 +00:00
0bf05802a5
Merge branch '291-css-of-the-join-column-not-right-on-the-circles-administration-page' into staging
2019-12-16 11:33:44 +01:00
40143009aa
admin-circles: buttons are centered with the right color
2019-12-16 10:48:05 +01:00
fd47a715a8
Merge branch 'gm-fix-bug' into 'staging'
...
fix: overflow on menu and content
See merge request startinblox/applications/sib-app!92
2019-12-13 14:34:07 +00:00
fa50142438
fix: overflow on menu and content
2019-12-12 17:57:05 +01:00
752acbecae
fix: target user container on menu bar
2019-12-12 14:34:09 +01:00
c7291e5c6f
Merge branch '169-project-name-on-2-lines' into 'staging'
...
Left navbar: modifications according to the mockup update
See merge request startinblox/applications/sib-app!91
2019-12-12 13:31:37 +00:00
9762f8b0f9
Left navbar: modifications according to the wireframe update
2019-12-12 12:51:04 +01:00
13b24a2ee2
Merge branch 'staging' into project-admin
2019-12-10 16:04:55 +01:00
db2985857e
bugfix: cancel 2ba08635 css changes
2019-12-10 15:56:06 +01:00
d7b6b478cf
fix: remove team relation
2019-12-10 15:36:52 +01:00
caad1f69bf
fix: target sib-ac-checker to members
2019-12-10 15:33:33 +01:00
a5407f94fe
Merge branch 'staging' into project-admin
2019-12-10 15:32:57 +01:00
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
e56460948f
update: remove gitlab-ci
2019-12-10 14:54:49 +01:00
b20da1d5dd
Merge branch 'staging' into 'project-admin'
...
# Conflicts:
# src/menu-left.pug
2019-12-10 12:42:24 +00:00
Calum Mackervoy
Jean-Baptiste Pasquier
gaelle morin
Gaëlle Morin