# Conflicts:
#   src/menu-left.pug
#   src/page-circle-profile.pug

avatar displayed correctly

See merge request startinblox/applications/sib-app!97

Gm fixbug

See merge request startinblox/applications/sib-app!95

Circle admin role

See merge request startinblox/applications/sib-app!89

Calum Mackervoy authored 5 years ago and Gaëlle Morin committed 5 years ago

- CSS added
- architecture reworked
- new field 'is-admin' used
- members field used instead of team field.

# Conflicts:
#   src/menu-left.pug
#   src/page-project-profile.pug
#   src/page-project.pug

Gm fixbug

See merge request startinblox/applications/sib-app!94

Project info page

See merge request startinblox/applications/sib-app!87

Gaëlle Morin authored 5 years ago and Jean-Baptiste Pasquier committed 5 years ago

- 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.

added foaf:depiction to frontend context

See merge request startinblox/applications/sib-app!93

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

fix: overflow on menu and content

See merge request startinblox/applications/sib-app!92

Left navbar: modifications according to the mockup update

See merge request startinblox/applications/sib-app!91

Deploy sibapp with managers

See merge request startinblox/applications/sib-app!74

# Conflicts:
#   src/menu-left.pug

Resolve "Project name on 2 lines"

See merge request startinblox/applications/sib-app!84