Commit Graph

Select branches

Hide Pull Requests

webpushnotifications

Mono Color

• ef20af91dd
  fix: remove members on project creation Jean-Baptiste Pasquier 2020-01-03 14:15:31 +0100
• c493764d4d
  fix: cancel src to user container for project and circles Jean-Baptiste Pasquier 2020-01-03 14:08:06 +0100
• d0d5cd6403
  fix: drive source file Jean-Baptiste Pasquier 2020-01-03 14:02:19 +0100
• 6f1dd7d66c Merge branch 'staging' into 'project-admin' Jean-Baptiste Pasquier 2019-12-21 18:06:20 +0000
• 7c26bc5f6d Merge branch 'circle-members-avatar' into 'staging' Jean-Baptiste Pasquier 2019-12-20 23:22:59 +0000
• f3890f49e0 avatar displayed correctly Calum Mackervoy 2019-12-20 23:22:59 +0000
• 5fff6e286a Merge branch 'gm-fixbug' into 'staging' Jean-Baptiste Pasquier 2019-12-20 15:29:05 +0000
• 2e7d8f5ec9 Gm fixbug Gaëlle Morin 2019-12-20 15:29:05 +0000
• 17d2cd3137 Merge branch 'circle-admin-role' into 'staging' Jean-Baptiste Pasquier 2019-12-20 15:28:33 +0000
• 7fae8e6387
  feature: members' name of a project now displayed gaelle morin 2019-12-20 16:09:18 +0100
• 65c6b77fbc
  feature: admin of a circle displayed Calum Mackervoy 2019-11-21 20:45:57 +0100
• 92840cf8ff
  Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging gaelle morin 2019-12-19 14:19:40 +0100
• 87705111bc Merge branch 'staging' into 'project-admin' Jean-Baptiste Pasquier 2019-12-19 13:14:34 +0000
• d441ebc80a Merge branch 'gm-fixbug' into 'staging' Jean-Baptiste Pasquier 2019-12-19 13:10:09 +0000
• 68335ab8d8 Gm fixbug Gaëlle Morin 2019-12-19 13:10:09 +0000
• 2abfaf1572
  Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging gaelle morin 2019-12-19 10:54:29 +0100
• e9a56086cb
  fix: Image path fix Jean-Baptiste Pasquier 2019-12-18 20:46:01 +0100
• 300d8bbfbd Merge branch 'project-info-page' into 'staging' Jean-Baptiste Pasquier 2019-12-18 18:50:47 +0000
• 40e103fc00 feature: project-profile page Gaëlle Morin 2019-12-18 18:50:47 +0000
• a2ff7358fd
  Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging gaelle morin 2019-12-18 18:28:34 +0100
• 255083d2c1 Merge branch 'avatar-bug' into 'staging' Jean-Baptiste Pasquier 2019-12-18 16:37:01 +0000
• 9903df3018 added foaf:depiction to frontend context Calum Mackervoy 2019-12-18 16:37:01 +0000
• b932d26db2
  Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into staging gaelle morin 2019-12-16 15:51:17 +0100
• b4dd622fc9 Merge branch '291-css-of-the-join-column-not-right-on-the-circles-administration-page' into 'staging' Jean-Baptiste Pasquier 2019-12-16 14:02:13 +0000
• 0bf05802a5
  Merge branch '291-css-of-the-join-column-not-right-on-the-circles-administration-page' into staging gaelle morin 2019-12-16 11:33:44 +0100
• 40143009aa
  admin-circles: buttons are centered with the right color Gaëlle Morin 2019-11-29 16:57:11 +0100
• fd47a715a8 Merge branch 'gm-fix-bug' into 'staging' Jean-Baptiste Pasquier 2019-12-13 14:34:07 +0000
• fa50142438 fix: overflow on menu and content Gaëlle Morin 2019-12-12 17:32:00 +0100
• 752acbecae
  fix: target user container on menu bar Jean-Baptiste Pasquier 2019-12-12 14:34:09 +0100
• c7291e5c6f Merge branch '169-project-name-on-2-lines' into 'staging' Jean-Baptiste Pasquier 2019-12-12 13:31:37 +0000
• 9762f8b0f9 Left navbar: modifications according to the wireframe update Gaëlle Morin 2019-12-11 18:06:42 +0100
• 13b24a2ee2
  Merge branch 'staging' into project-admin Jean-Baptiste Pasquier 2019-12-10 16:04:55 +0100
• db2985857e
  bugfix: cancel 2ba08635 css changes Jean-Baptiste Pasquier 2019-12-10 15:56:06 +0100
• d7b6b478cf
  fix: remove team relation Jean-Baptiste Pasquier 2019-12-10 15:36:52 +0100
• caad1f69bf
  fix: target sib-ac-checker to members Jean-Baptiste Pasquier 2019-12-10 15:33:33 +0100
• a5407f94fe
  Merge branch 'staging' into project-admin Jean-Baptiste Pasquier 2019-12-10 15:32:57 +0100
• bc45d421f8 Merge branch 'feat/manager_deploy' into 'staging' Jean-Baptiste Pasquier 2019-12-10 13:57:41 +0000
• e56460948f
  update: remove gitlab-ci Jean-Baptiste Pasquier 2019-12-10 14:54:49 +0100
• b20da1d5dd Merge branch 'staging' into 'project-admin' Jean-Baptiste Pasquier 2019-12-10 12:42:24 +0000
• 2ba086355e Merge branch '169-project-name-on-2-lines' into 'staging' Jean-Baptiste Pasquier 2019-12-10 10:53:27 +0000
• a7a5555ad3
  fix: resolve #311 Jean-Baptiste Pasquier 2019-12-10 11:52:39 +0100
• 2e3be21cdc
  update: adding project admin & creation Jean-Baptiste Pasquier 2019-12-09 18:23:47 +0100
• 49e8fe9fee
  Merge branch 'staging' into feat/manager_deploy Jean-Baptiste Pasquier 2019-12-06 16:16:49 +0100
• 2a42821001 Merge branch 'user-profile-info' into 'staging' Jean-Baptiste Pasquier 2019-12-04 15:16:52 +0000
• ef256c70f4 external context instead of _ in name Calum Mackervoy 2019-12-04 16:11:05 +0100
• 4d40e538a2 modifications according to the changes in the wireframe Gaëlle Morin 2019-11-29 14:28:23 +0100
• fa4a1f0b0e fixed first name display in userDetails Calum Mackervoy 2019-12-04 12:27:05 +0100
• a821bc1c3b
  fix: ssh user and adress of test-nantes & stage for test-nantes Jean-Baptiste Pasquier 2019-12-03 14:51:54 +0100
• 7d382df653 cicd: added production environment plup 2019-12-02 21:01:47 +0100
• 5e8557f84d
  Merge branch 'feat/developper-instance' into feat/manager_deploy Jean-Baptiste Pasquier 2019-12-02 15:29:05 +0100
• 6ce9be28ba
  Merge branch 'staging' into feat/manager_deploy Jean-Baptiste Pasquier 2019-12-02 15:25:46 +0100
• 1b8f3e7b7f
  update: fixes for development usage Jean-Baptiste Pasquier 2019-12-02 15:22:25 +0100
• 33e2278ffb
  Merge branch 'feat/manager_deploy' of git.happy-dev.fr:startinblox/applications/sib-app into project-integration-manager Jean-Baptiste Pasquier 2019-12-02 14:04:28 +0100
• 1ade7ded23 Left-nav bar: new styles + overflow and hovering to handle long names Gaëlle Morin 2019-11-27 12:06:23 +0100
• dbf918f351 Merge branch 'circle-edit-redirect' into 'staging' Jean-Baptiste Pasquier 2019-11-29 15:16:53 +0000
• d03e58932b Circle edit redirect Calum Mackervoy 2019-11-29 15:16:53 +0000
• 19bd61ae38 Merge branch 'esc-close-rightmenu' into 'staging' Jean-Baptiste Pasquier 2019-11-25 18:54:54 +0000
• d63ee9b6fb Esc key close rightmenu Calum Mackervoy 2019-11-25 18:54:54 +0000
• 64353833bc cicd: added staging banch for autodeploy plup 2019-11-20 23:02:44 +0100
• 18f6153b6c cicd: fixed dist folder name plup 2019-11-20 22:41:55 +0100
• 567a2076e2 cicd: removed windows linebreak plup 2019-11-20 22:37:41 +0100
• fa0121e9eb cicd: removed windows linebreak plup 2019-11-20 22:36:13 +0100
• 89a082892c cicd: removed windows linebreak plup 2019-11-20 22:31:16 +0100
• 7c976d602b cicd: removed windows linebreak plup 2019-11-20 22:20:37 +0100
• 691bfbe563 cicd: removed windows linebreak plup 2019-11-20 22:14:04 +0100
• 065541a648 cicd: tried to print the keyw plup 2019-11-20 22:09:40 +0100
• 7faeafd21d cicd: restricted permission on key plup 2019-11-20 22:05:53 +0100
• 334b3a7cda cicd: removed hostkey check plup 2019-11-20 22:03:08 +0100
• c8d25da34f cicd: fixed filename plup 2019-11-20 21:10:50 +0100
• 64c5ad65c3 cicd: fixed private key variable plup 2019-11-20 21:09:14 +0100
• 81776a45c4 cicd: added tag plup 2019-11-20 21:06:30 +0100
• 6459e73e8b cicd: added gitlab-ci plup 2019-11-20 21:05:23 +0100
• c5eb67b4d4 Merge branch 'circle-css' into 'staging' Jean-Baptiste Pasquier 2019-11-19 15:07:51 +0000
• ba942945f2
  fix: admin panel is not coming soon! Jean-Baptiste Pasquier 2019-11-18 14:14:46 +0100
• d0ebb84d24 feature: copied statics to dist plup 2019-11-16 18:10:05 +0100
• 4f5d352e4d doc: changed account login sentence plup 2019-11-16 16:09:55 +0100
• bd87d4847b doc: pointed the config.json file description to wiki plup 2019-11-16 16:04:38 +0100
• 34247826b2
  fix: context for jabberID Jean-Baptiste Pasquier 2019-11-15 17:13:17 +0100
• 27098f59c5
  fix: context for jabberID Jean-Baptiste Pasquier 2019-11-15 16:51:22 +0100
• 150464dfc1
  fix: context for jabberID Jean-Baptiste Pasquier 2019-11-15 16:50:20 +0100
• 6d70a9c11e fix: conflicts with master Jean-Baptiste Pasquier 2019-11-15 13:22:09 +0000
• bae6838ca4 Merge branch 'collapse-user-control' into 'circle-css' Jean-Baptiste Pasquier 2019-11-15 13:02:08 +0000
• bbc4a9356c added listener to close user control Calum Mackervoy 2019-11-15 13:02:08 +0000
• f3381ba8da Merge branch 'circles-admin-page' into 'circle-css' Jean-Baptiste Pasquier 2019-11-15 12:29:41 +0000
• 89f62025b4 circles not collapsable Calum Mackervoy 2019-11-15 12:29:41 +0000
• 3a859bcdc3 doc: updated with reference to doc in wiki plup 2019-11-14 19:29:14 +0100
• 983eab6ef3 feat: cleaned old building methods plup 2019-11-14 17:59:57 +0100
• 643420d6ce feat: rolled back on webpack plup 2019-11-14 17:34:37 +0100
• 0c3b74bcaf
  update: making join leave works Jean-Baptiste Pasquier 2019-11-14 13:27:04 +0100
• a342e5d431 hidden class added on sib-router Gaëlle Morin 2019-11-13 15:23:54 +0100
• 772e1e456b Tables ok Gaëlle Morin 2019-11-13 12:00:38 +0100
• 03df657caf full css rework on tables. Need refactor Gaëlle Morin 2019-11-12 23:16:56 +0100
• 30de8eed82
  fix: @gaelle target wrong class Jean-Baptiste Pasquier 2019-11-12 13:25:39 +0100
• 809978ecc8
  fix: last one @gaelle Jean-Baptiste Pasquier 2019-11-12 13:22:23 +0100
• 8784ae7641
  fix: selector for admin css Jean-Baptiste Pasquier 2019-11-12 13:13:52 +0100
• aa46aeed78
  fix: clear cache Jean-Baptiste Pasquier 2019-11-12 12:49:12 +0100
• 0566f34ec4
  fix: @gaelle Jean-Baptiste Pasquier 2019-11-12 12:34:33 +0100
• e60c6d6d1f
  fix: @gaelle Jean-Baptiste Pasquier 2019-11-12 12:31:06 +0100
• 9795498944
  fix: selector @gaelle Jean-Baptiste Pasquier 2019-11-12 12:26:34 +0100
• 1eb83f2a80 match the mock-ups ok Gaëlle Morin 2019-11-11 11:50:10 +0100