 Jean-Baptiste Pasquier
|
29ce7cdfd0
|
fix: quickfix for client logo height
|
2020-01-16 20:56:54 +01:00 |
|
|
Jean-Baptiste Pasquier
|
cfac96b12a
|
fix: title from config.sjon
|
2020-01-16 20:51:54 +01:00 |
|
|
Jean-Baptiste Pasquier
|
9185793c04
|
fix: logo auto size
|
2020-01-16 20:50:20 +01:00 |
|
|
Jean-Baptiste Pasquier
|
2485e00aff
|
Merge branch 'parameters-on-sample-for-clients' into 'staging'
Parameters on sample for clients
See merge request startinblox/applications/sib-app!103
|
2020-01-16 19:33:11 +00:00 |
|
|
Jean-Baptiste Pasquier
|
a0cd6bb468
|
Merge branch 'staging' into 'parameters-on-sample-for-clients'
# Conflicts:
# src/menu-left.pug
|
2020-01-16 19:32:55 +00:00 |
|
|
Jean-Baptiste Pasquier
|
4cf9cce6ad
|
fix: add parameters on sample and var for logo
|
2020-01-16 20:31:28 +01:00 |
|
|
Jean-Baptiste Pasquier
|
7b1eab139e
|
Merge branch 'project-admin' into 'staging'
Project admin listing & project creation
See merge request startinblox/applications/sib-app!88
|
2020-01-10 19:59:38 +00:00 |
|
|
Jean-Baptiste Pasquier
|
78532f230c
|
temporary removed project from menu
|
2020-01-10 16:43:05 +01:00 |
|
|
Jean-Baptiste Pasquier
|
07abdce85c
|
Merge branch 'staging' into project-admin
|
2020-01-09 11:34:17 +01:00 |
|
|
Jean-Baptiste Pasquier
|
9ad8126311
|
Merge branch 'project-admin-display' into 'staging'
project team displaying is_admin and avatar correctly
See merge request startinblox/applications/sib-app!98
|
2020-01-09 09:03:48 +00:00 |
|
|
Jean-Baptiste Pasquier
|
29dbd1f649
|
Merge branch 'customer-null-values' into 'staging'
Don't display null customer details
See merge request startinblox/applications/sib-app!96
|
2020-01-09 09:00:21 +00:00 |
|
|
Jean-Baptiste Pasquier
|
d590632130
|
fix: left menu arrows
|
2020-01-06 15:00:40 +01:00 |
|
|
Jean-Baptiste Pasquier
|
ef20af91dd
|
fix: remove members on project creation
|
2020-01-03 14:15:31 +01:00 |
|
|
Jean-Baptiste Pasquier
|
c493764d4d
|
fix: cancel src to user container for project and circles
|
2020-01-03 14:08:06 +01:00 |
|
|
Jean-Baptiste Pasquier
|
d0d5cd6403
|
fix: drive source file
|
2020-01-03 14:02:19 +01:00 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Jean-Baptiste Pasquier
|
a821bc1c3b
|
fix: ssh user and adress of test-nantes & stage for test-nantes
|
2019-12-03 14:51:54 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
Jean-Baptiste Pasquier
|
f3381ba8da
|
Merge branch 'circles-admin-page' into 'circle-css'
Link to circles admin page
See merge request startinblox/applications/sib-app!78
|
2019-11-15 12:29:41 +00:00 |
|
|
Jean-Baptiste Pasquier
|
0c3b74bcaf
|
update: making join leave works
|
2019-11-14 13:27:04 +01:00 |
|
|
Jean-Baptiste Pasquier
|
30de8eed82
|
fix: @gaelle target wrong class
|
2019-11-12 13:25:39 +01:00 |
|
|
Jean-Baptiste Pasquier
|
809978ecc8
|
fix: last one @gaelle
|
2019-11-12 13:22:23 +01:00 |
|
|
Jean-Baptiste Pasquier
|
8784ae7641
|
fix: selector for admin css
|
2019-11-12 13:13:52 +01:00 |
|
|
Jean-Baptiste Pasquier
|
aa46aeed78
|
fix: clear cache
|
2019-11-12 12:49:12 +01:00 |
|
|
Jean-Baptiste Pasquier
|
0566f34ec4
|
fix: @gaelle
|
2019-11-12 12:34:33 +01:00 |
|
|
Jean-Baptiste Pasquier
|
e60c6d6d1f
|
fix: @gaelle
|
2019-11-12 12:31:06 +01:00 |
|
|
Jean-Baptiste Pasquier
|
9795498944
|
fix: selector @gaelle
|
2019-11-12 12:26:34 +01:00 |
|
|
Jean-Baptiste Pasquier
|
c1c46722da
|
fix: sib-router hidden on circle-profile
|
2019-11-06 20:44:22 +00:00 |
|
|
Jean-Baptiste Pasquier
|
3c7700e966
|
update: semantic css for buttons
|
2019-11-05 16:52:34 +00:00 |
|
|
Jean-Baptiste Pasquier
|
4aa69a1605
|
update: simplify dom for circles
|
2019-10-29 15:48:37 +01:00 |
|
|
Jean-Baptiste Pasquier
|
c50e05530e
|
fix: js recursive parent selector for admin
|
2019-10-29 15:38:33 +01:00 |
|
|
Jean-Baptiste Pasquier
|
5adbd98f51
|
fix: path template & js leave button
|
2019-10-29 15:15:02 +01:00 |
|
|
Jean-Baptiste Pasquier
|
7e0653f14b
|
Merge branch 'jbpasquier/circle-information' into circle-wip-merge
|
2019-10-29 15:03:48 +01:00 |
|
|
Jean-Baptiste Pasquier
|
3c72a4fee0
|
update: user avatar on admin
|
2019-10-29 14:59:57 +01:00 |
|
|
Jean-Baptiste Pasquier
|
a5a63bd162
|
Merge branch 'circle-admin' into circle-wip-merge
|
2019-10-29 14:43:37 +01:00 |
|
|
Jean-Baptiste Pasquier
|
40eeef9d44
|
fix: account context
|
2019-10-29 14:38:59 +01:00 |
|
|
Jean-Baptiste Pasquier
|
7a24d37d8f
|
fix: creation date issue
|
2019-10-29 11:33:26 +01:00 |
|
|
Jean-Baptiste Pasquier
|
6803b965fb
|
fix: add bug info with issue link
|
2019-10-29 11:32:44 +01:00 |
|
|
Jean-Baptiste Pasquier
|
cb22295aa6
|
update: add administration & circle creation
|
2019-10-29 11:32:36 +01:00 |
|
|
Jean-Baptiste Pasquier
|
9db2e1b99b
|
update: Cleanup circle information
|
2019-10-29 11:31:48 +01:00 |
|
|
Jean-Baptiste Pasquier
|
c53f4c8d94
|
Merge branch 'gm-fix-scrollbar' into 'staging'
fix: double vertical scrollbar erased
See merge request startinblox/applications/sib-app!75
|
2019-10-28 17:08:23 +00:00 |
|
|
Jean-Baptiste Pasquier
|
d08153c797
|
fix: creation date issue
|
2019-10-28 13:55:43 +01:00 |
|
|
Jean-Baptiste Pasquier
|
4de5229960
|
fix: css merge
|
2019-10-25 19:25:06 +02:00 |
|
|
Jean-Baptiste Pasquier
|
e56a65a0cd
|
fix: add bug info with issue link
|
2019-10-25 19:17:48 +02:00 |
|
|
Jean-Baptiste Pasquier
|
09f35bd3c0
|
update: add administration & circle creation
|
2019-10-25 19:15:45 +02:00 |
|
|
Jean-Baptiste Pasquier
|
1c2789812e
|
Merge branch 'staging' of git.happy-dev.fr:startinblox/applications/sib-app into jbpasquier/admin
|
2019-10-25 19:08:54 +02:00 |
|
|
Jean-Baptiste Pasquier
|
81d885730d
|
Merge branch 'gm-css-fixup' into 'staging'
fix: CSS fix on circle-edit page
See merge request startinblox/applications/sib-app!73
|
2019-10-25 16:24:43 +00:00 |
|
|
Jean-Baptiste Pasquier
|
d4279b0c7a
|
update: Cleanup circle information
|
2019-10-25 15:35:14 +02:00 |
|
|
Jean-Baptiste Pasquier
|
8e7547d06b
|
fix: fixing sib-ac-checker
|
2019-10-24 22:26:47 +02:00 |
|
|
Jean-Baptiste Pasquier
|
65691721d2
|
Merge branch 'gm-missing-edit-circle' into 'staging'
Resolve "Missing edit circle"
See merge request startinblox/applications/sib-app!71
|
2019-10-24 20:05:50 +00:00 |
|
|
Jean-Baptiste Pasquier
|
48075b2419
|
update: imbricate edit in profile & fix css
|
2019-10-24 22:03:15 +02:00 |
|
|
Jean-Baptiste Pasquier
|
9e3dc8fe8c
|
fix: edit template dup name
|
2019-10-24 21:44:35 +02:00 |
|
|
Jean-Baptiste Pasquier
|
7086dbd931
|
Merge branch '201-right-column-missing-on-the-circles' of git.happy-dev.fr:startinblox/applications/sib-app into gm-missing-edit-circle
|
2019-10-24 21:44:14 +02:00 |
|
|
Jean-Baptiste Pasquier
|
e1ec289f61
|
Merge branch 'gm-missing-edit-circle' of git.happy-dev.fr:startinblox/applications/sib-app into gm-missing-edit-circle
|
2019-10-24 21:24:10 +02:00 |
|
|
Jean-Baptiste Pasquier
|
a4314210b4
|
update: working form + back link
|
2019-10-24 21:23:11 +02:00 |
|
|
Jean-Baptiste Pasquier
|
a71fbf1b78
|
Merge branch 'staging' into gm-missing-edit-circle
|
2019-10-24 16:22:06 +02:00 |
|
|
Jean-Baptiste Pasquier
|
61be5d780c
|
fix: empty circles/projects for anonymous
|
2019-10-16 18:28:19 +02:00 |
|
|
Jean-Baptiste Pasquier
|
dda3ecfa46
|
update: add context (LDFlex needing)
|
2019-10-16 17:10:00 +02:00 |
|
|
Jean-Baptiste Pasquier
|
b71d79e608
|
Merge branch '145' into 'staging'
Solves #145: add project captains to project page
See merge request startinblox/applications/sib-app!68
|
2019-10-16 13:22:06 +00:00 |
|
|
Jean-Baptiste Pasquier
|
21d485c492
|
fix: _ & LDFlex on header
|
2019-10-16 13:21:23 +02:00 |
|
|
Jean-Baptiste Pasquier
|
da56c3a003
|
update: menu filtered for projects
|
2019-10-16 12:56:33 +02:00 |
|
|
Jean-Baptiste Pasquier
|
5c89cb116d
|
update: versions to 0.9 (missing notification)
|
2019-10-16 12:40:01 +02:00 |
|
|
Jean-Baptiste Pasquier
|
97af8eb377
|
Merge branch 'master' into staging
|
2019-10-15 15:52:41 +02:00 |
|