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 |
|
Gaëlle Morin
|
1ade7ded23
|
Left-nav bar: new styles + overflow and hovering to handle long names
|
2019-11-29 17:02:55 +01:00 |
|
Jean-Baptiste Pasquier
|
dbf918f351
|
Merge branch 'circle-edit-redirect' into 'staging'
Circle edit redirect
See merge request startinblox/applications/sib-app!80
|
2019-11-29 15:16:53 +00:00 |
|
Calum Mackervoy
|
d03e58932b
|
Circle edit redirect
|
2019-11-29 15:16:53 +00:00 |
|
Jean-Baptiste Pasquier
|
19bd61ae38
|
Merge branch 'esc-close-rightmenu' into 'staging'
Esc key close rightmenu
See merge request startinblox/applications/sib-app!82
|
2019-11-25 18:54:54 +00:00 |
|
Calum Mackervoy
|
d63ee9b6fb
|
Esc key close rightmenu
|
2019-11-25 18:54:54 +00:00 |
|
plup
|
64353833bc
|
cicd: added staging banch for autodeploy
|
2019-11-20 23:02:44 +01:00 |
|
plup
|
18f6153b6c
|
cicd: fixed dist folder name
|
2019-11-20 22:41:55 +01:00 |
|
plup
|
567a2076e2
|
cicd: removed windows linebreak
|
2019-11-20 22:37:41 +01:00 |
|
plup
|
fa0121e9eb
|
cicd: removed windows linebreak
|
2019-11-20 22:36:13 +01:00 |
|
plup
|
89a082892c
|
cicd: removed windows linebreak
|
2019-11-20 22:31:16 +01:00 |
|
plup
|
7c976d602b
|
cicd: removed windows linebreak
|
2019-11-20 22:20:37 +01:00 |
|
plup
|
691bfbe563
|
cicd: removed windows linebreak
|
2019-11-20 22:14:04 +01:00 |
|
plup
|
065541a648
|
cicd: tried to print the keyw
|
2019-11-20 22:09:40 +01:00 |
|
plup
|
7faeafd21d
|
cicd: restricted permission on key
|
2019-11-20 22:05:53 +01:00 |
|
plup
|
334b3a7cda
|
cicd: removed hostkey check
|
2019-11-20 22:03:08 +01:00 |
|
plup
|
c8d25da34f
|
cicd: fixed filename
|
2019-11-20 21:10:50 +01:00 |
|
plup
|
64c5ad65c3
|
cicd: fixed private key variable
|
2019-11-20 21:09:14 +01:00 |
|
plup
|
81776a45c4
|
cicd: added tag
|
2019-11-20 21:06:30 +01:00 |
|
plup
|
6459e73e8b
|
cicd: added gitlab-ci
|
2019-11-20 21:05:23 +01:00 |
|
Jean-Baptiste Pasquier
|
c5eb67b4d4
|
Merge branch 'circle-css' into 'staging'
Circle
See merge request startinblox/applications/sib-app!77
|
2019-11-19 15:07:51 +00:00 |
|
Jean-Baptiste Pasquier
|
ba942945f2
|
fix: admin panel is not coming soon!
|
2019-11-18 14:14:46 +01:00 |
|
plup
|
d0ebb84d24
|
feature: copied statics to dist
|
2019-11-16 18:10:05 +01:00 |
|
plup
|
4f5d352e4d
|
doc: changed account login sentence
|
2019-11-16 16:09:55 +01:00 |
|
plup
|
bd87d4847b
|
doc: pointed the config.json file description to wiki
|
2019-11-16 16:04:49 +01:00 |
|
Jean-Baptiste Pasquier
|
34247826b2
|
fix: context for jabberID
|
2019-11-15 17:13:17 +01:00 |
|
Jean-Baptiste Pasquier
|
27098f59c5
|
fix: context for jabberID
|
2019-11-15 16:51:22 +01:00 |
|
Jean-Baptiste Pasquier
|
150464dfc1
|
fix: context for jabberID
|
2019-11-15 16:50:20 +01:00 |
|
Jean-Baptiste Pasquier
|
6d70a9c11e
|
fix: conflicts with master
|
2019-11-15 13:22:09 +00:00 |
|
Jean-Baptiste Pasquier
|
bae6838ca4
|
Merge branch 'collapse-user-control' into 'circle-css'
added listener to collapse user control
See merge request startinblox/applications/sib-app!79
|
2019-11-15 13:02:08 +00:00 |
|