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
gaelle morin
92840cf8ff
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-19 14:19:40 +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
Jean-Baptiste Pasquier
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
Gaëlle Morin
68335ab8d8
Gm fixbug
2019-12-19 13:10:09 +00:00
gaelle morin
2abfaf1572
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-19 10:54:29 +01:00
Jean-Baptiste Pasquier
e9a56086cb
fix: Image path fix
2019-12-18 20:46:01 +01:00
Jean-Baptiste Pasquier
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
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
gaelle morin
a2ff7358fd
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-18 18:28:34 +01:00
Jean-Baptiste Pasquier
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
Calum Mackervoy
9903df3018
added foaf:depiction to frontend context
2019-12-18 16:37:01 +00:00
gaelle morin
b932d26db2
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging
2019-12-16 15:51:17 +01:00
Jean-Baptiste Pasquier
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
gaelle morin
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
Gaëlle Morin
40143009aa
admin-circles: buttons are centered with the right color
2019-12-16 10:48:05 +01:00
Jean-Baptiste Pasquier
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
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
Jean-Baptiste Pasquier
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
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
a5407f94fe
Merge branch 'staging' into project-admin
2019-12-10 15:32:57 +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
e56460948f
update: remove gitlab-ci
2019-12-10 14:54:49 +01: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
Jean-Baptiste Pasquier
2e3be21cdc
update: adding project admin & creation
2019-12-09 18:23:47 +01:00
Jean-Baptiste Pasquier
49e8fe9fee
Merge branch 'staging' into feat/manager_deploy
2019-12-06 16:16:49 +01:00
Jean-Baptiste Pasquier
2a42821001
Merge branch 'user-profile-info' into 'staging'
...
fixed first name display in userDetails
See merge request startinblox/applications/sib-app!86
2019-12-04 15:16:52 +00:00
Calum Mackervoy
ef256c70f4
external context instead of _ in name
2019-12-04 16:11:05 +01:00
Gaëlle Morin
4d40e538a2
modifications according to the changes in the wireframe
2019-12-04 14:53:18 +01:00
Calum Mackervoy
fa4a1f0b0e
fixed first name display in userDetails
2019-12-04 12:27:05 +01:00
Jean-Baptiste Pasquier
a821bc1c3b
fix: ssh user and adress of test-nantes & stage for test-nantes
2019-12-03 14:51:54 +01:00
plup
7d382df653
cicd: added production environment
2019-12-02 21:01:47 +01:00
Jean-Baptiste Pasquier
5e8557f84d
Merge branch 'feat/developper-instance' into feat/manager_deploy
2019-12-02 15:29:05 +01:00
Jean-Baptiste Pasquier
6ce9be28ba
Merge branch 'staging' into feat/manager_deploy
2019-12-02 15:25:46 +01:00
Jean-Baptiste Pasquier
1b8f3e7b7f
update: fixes for development usage
2019-12-02 15:22:25 +01:00
Jean-Baptiste Pasquier
33e2278ffb
Merge branch 'feat/manager_deploy' of git.happy-dev.fr:startinblox/applications/sib-app into project-integration-manager
2019-12-02 14:04:28 +01:00
