Commits · bf5a379b133f97710ade49f7516970cc8d9e6039 · Applications / Orbit

Jan 18, 2020

Merge branch 'edit-project-customer-dropdown' of... · bf5a379b

Gaëlle Morin authored 5 years ago

Merge branch 'edit-project-customer-dropdown' of git.happy-dev.fr:startinblox/applications/sib-app into gm-test-2

Unverified

bf5a379b

Jan 16, 2020
- fix: quickfix for client logo height · 29ce7cdf
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  29ce7cdf
- fix: title from config.sjon · cfac96b1
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  cfac96b1
- fix: logo auto size · 9185793c
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  9185793c
- Merge branch 'parameters-on-sample-for-clients' into 'staging' · 2485e00a
  Jean-Baptiste Pasquier authored 5 years ago
  
  Parameters on sample for clients See merge request startinblox/applications/sib-app!103
  2485e00a
- Merge branch 'staging' into 'parameters-on-sample-for-clients' · a0cd6bb4
  Jean-Baptiste Pasquier authored 5 years ago
  
  # Conflicts: # src/menu-left.pug
  a0cd6bb4
- fix: add parameters on sample and var for logo · 4cf9cce6
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  4cf9cce6
- css for project-edit added + refactoring · b0e7584a
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  b0e7584a
Jan 14, 2020
- fixed merge conflicts · 22094928
  Calum Mackervoy authored 5 years ago
  
  22094928
Jan 13, 2020
- customer dropdown for project create · 6a0821a5
  Calum Mackervoy authored 5 years ago
  
  6a0821a5
- customer dropdown in project-edit · e5084545
  Calum Mackervoy authored 5 years ago
  
  e5084545
Jan 10, 2020
- Merge branch 'project-admin' into 'staging' · 7b1eab13
  Jean-Baptiste Pasquier authored 5 years ago
  
  Project admin listing & project creation See merge request startinblox/applications/sib-app!88
  7b1eab13
- temporary removed project from menu · 78532f23
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  78532f23
Jan 09, 2020
- customer dropdown in edit-project · bb40beb4
  Calum Mackervoy authored 5 years ago
  
  bb40beb4
- Merge branch 'staging' into project-admin · 07abdce8
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  07abdce8
- Merge branch 'project-admin-display' into 'staging' · 9ad81263
  Jean-Baptiste Pasquier authored 5 years ago
  
  project team displaying is_admin and avatar correctly See merge request startinblox/applications/sib-app!98
  9ad81263
- project team displaying is_admin and avatar correctly · c17912b0
  Calum Mackervoy authored 5 years ago and Jean-Baptiste Pasquier committed 5 years ago
  
  c17912b0
- Merge branch 'customer-null-values' into 'staging' · 29dbd1f6
  Jean-Baptiste Pasquier authored 5 years ago
  
  Don't display null customer details See merge request startinblox/applications/sib-app!96
  29dbd1f6
- Don't display null customer details · 1ae56e77
  Calum Mackervoy authored 5 years ago and Jean-Baptiste Pasquier committed 5 years ago
  
  1ae56e77
Jan 08, 2020
- CSS: styles of table refactored · 74fe061e
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  74fe061e
- admin-project: hashtag added to project's name · 5affa10a
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  5affa10a
- 'fieldset' added to admin-project-create · 52dc49fc
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  52dc49fc
- admin-project: table ok + icon added in sidebar · 1ca89429
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  1ca89429
Jan 06, 2020
- Merge branch 'project-admin' of... · 235d3f7f
  Gaëlle Morin authored 5 years ago
  
  Merge branch 'project-admin' of git.happy-dev.fr:startinblox/applications/sib-app into project-admin
  Unverified
  
  235d3f7f
- admin-project-create: form stylized (part 1) · ebfd1fe4
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  ebfd1fe4
- fix: left menu arrows · d5906321
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  d5906321
- Left menu: css improved for the projects tab · 4fb569b9
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  4fb569b9
Jan 03, 2020
- fix: remove members on project creation · ef20af91
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  ef20af91
- fix: cancel src to user container for project and circles · c493764d
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  c493764d
- fix: drive source file · d0d5cd64
  Jean-Baptiste Pasquier authored 5 years ago
  
  Verified
  
  d0d5cd64
Dec 21, 2019
- Merge branch 'staging' into 'project-admin' · 6f1dd7d6
  Jean-Baptiste Pasquier authored 5 years ago
  
  # Conflicts: # src/menu-left.pug # src/page-circle-profile.pug
  6f1dd7d6
- Merge branch 'circle-members-avatar' into 'staging' · 7c26bc5f
  Jean-Baptiste Pasquier authored 5 years ago
  
  avatar displayed correctly See merge request startinblox/applications/sib-app!97
  7c26bc5f
- avatar displayed correctly · f3890f49
  Calum Mackervoy authored 5 years ago and Jean-Baptiste Pasquier committed 5 years ago
  
  f3890f49
Dec 20, 2019
- Merge branch 'gm-fixbug' into 'staging' · 5fff6e28
  Jean-Baptiste Pasquier authored 5 years ago
  
  Gm fixbug See merge request startinblox/applications/sib-app!95
  5fff6e28
- Gm fixbug · 2e7d8f5e
  Gaëlle Morin authored 5 years ago and Jean-Baptiste Pasquier committed 5 years ago
  
  2e7d8f5e
- Merge branch 'circle-admin-role' into 'staging' · 17d2cd31
  Jean-Baptiste Pasquier authored 5 years ago
  
  Circle admin role See merge request startinblox/applications/sib-app!89
  17d2cd31
- feature: members' name of a project now displayed · 7fae8e63
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  7fae8e63
- feature: admin of a circle displayed · 65c6b77f
  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.
  Unverified
  
  65c6b77f
Dec 19, 2019
- Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging · 92840cf8
  Gaëlle Morin authored 5 years ago
  
  Unverified
  
  92840cf8
- Merge branch 'staging' into 'project-admin' · 87705111
  Jean-Baptiste Pasquier authored 5 years ago
  
  # Conflicts: # src/menu-left.pug # src/page-project-profile.pug # src/page-project.pug
  87705111