 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
|
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
|
db2985857e
|
bugfix: cancel 2ba08635 css changes
|
2019-12-10 15:56:06 +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
|
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
|
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 |
|
|
Jean-Baptiste Pasquier
|
3625cad5e7
|
Merge branch '224' into 'master'
bugfix: add client name to sib-auth-provider's dataset (startinblox/applications/sib-app#224)
See merge request startinblox/applications/sib-app!72
|
2019-10-15 13:49:43 +00:00 |
|
|
Jean-Baptiste Pasquier
|
93895d166f
|
update: resolve !150
|
2019-10-02 16:56:49 +02:00 |
|
|
Jean-Baptiste Pasquier
|
c72ff3f6c1
|
update: sib-chat@0.3
|
2019-09-30 16:34:06 +02:00 |
|
|
Jean-Baptiste Pasquier
|
7c687fc09e
|
Merge branch '209-circle-name-in-app-header' into 'staging'
Resolve "Circle name in app header"
See merge request startinblox/applications/sib-app!63
|
2019-09-17 17:31:51 +00:00 |
|
|
Jean-Baptiste Pasquier
|
0cc9887a0d
|
Merge branch 'gm-firefox-69-symbol-added-to-summary' into 'staging'
Resolve "(Firefox 69) Symbol added to summary"
See merge request startinblox/applications/sib-app!62
|
2019-09-06 12:17:25 +00:00 |
|
|
Jean-Baptiste Pasquier
|
2b6e1642c2
|
Merge branch 'staging' into alpha
|
2019-09-03 16:58:42 +02:00 |
|
|
Jean-Baptiste Pasquier
|
2976f8d686
|
fix: typo
|
2019-09-03 16:58:29 +02:00 |
|
|
Jean-Baptiste Pasquier
|
43bbbe30b0
|
Merge branch 'staging' into alpha
|
2019-08-26 12:54:14 +02:00 |
|
|
Jean-Baptiste Pasquier
|
d59d335426
|
fix: remove unused dependencies
|
2019-08-26 12:53:57 +02:00 |
|
|
Jean-Baptiste Pasquier
|
e6d74bb306
|
Merge branch 'staging' into 'alpha'
Staging
See merge request startinblox/applications/sib-app!61
|
2019-08-26 10:35:10 +00:00 |
|
|
Jean-Baptiste Pasquier
|
72a519e562
|
fix: order of circles & users
|
2019-08-26 10:34:33 +00:00 |
|
|
Jean-Baptiste Pasquier
|
bff79be2e5
|
Merge branch 'gm-members-responsive' into 'staging'
ui: members page responsive
See merge request startinblox/applications/sib-app!60
|
2019-08-19 12:16:34 +00:00 |
|
|
Jean-Baptiste Pasquier
|
8484786575
|
Merge branch 'clean-prod' into 'staging'
Remove all content for Alpha
See merge request startinblox/applications/sib-app!59
|
2019-08-16 15:50:25 +00:00 |
|
|
Jean-Baptiste Pasquier
|
582219cfd2
|
update: remove client_id from sample
|
2019-08-16 17:48:51 +02:00 |
|
|
Jean-Baptiste Pasquier
|
1b69319ce9
|
fix: chat works
|
2019-08-09 16:01:06 +02:00 |
|
|
Jean-Baptiste Pasquier
|
5fb9545e5c
|
update: remove menu
|
2019-08-08 16:00:16 +02:00 |
|
|
Jean-Baptiste Pasquier
|
4e09bb1c52
|
downgrade: keep only circle, oidc and users
|
2019-08-08 15:20:31 +02:00 |
|
|
Jean-Baptiste Pasquier
|
736338092c
|
Merge branch 'gm-project-edition' into 'staging'
Resolve "Project edition"
See merge request startinblox/applications/sib-app!57
|
2019-08-06 14:17:54 +00:00 |
|
|
Jean-Baptiste Pasquier
|
49456ea6a5
|
fix: small css fix
|
2019-08-02 17:04:25 +02:00 |
|
|
Jean-Baptiste Pasquier
|
4ad2b05682
|
Merge branch 'staging' into 'migrate-0.8'
# Conflicts:
# src/dependencies.pug
# src/scripts/index.js
|
2019-07-29 15:26:10 +00:00 |
|
|
Jean-Baptiste Pasquier
|
48ee36d13d
|
update: sib-chat@0.2
|
2019-07-29 14:41:05 +02:00 |
|
|
Jean-Baptiste Pasquier
|
5c52a5da94
|
Merge branch 'gm-the-aliens-are-too-big' into 'staging'
Resolve "The aliens are too big"
See merge request startinblox/applications/sib-app!55
|
2019-07-23 13:15:46 +00:00 |
|
|
Jean-Baptiste Pasquier
|
2433e71d44
|
update: WIP sib-core 0.8
|
2019-07-23 15:08:59 +02:00 |
|
|
Jean-Baptiste Pasquier
|
33e67925ad
|
Merge branch '139-comments-on-job-offers' into 'staging'
Resolve "Comments on job offers"
See merge request startinblox/applications/sib-app!48
|
2019-07-18 11:26:34 +00:00 |
|
|
Jean-Baptiste Pasquier
|
cf561e4510
|
Merge branch 'gm-update' into 'staging'
update: CSS refactoring
See merge request startinblox/applications/sib-app!52
|
2019-06-27 15:35:50 +00:00 |
|
|
Jean-Baptiste Pasquier
|
3accd38b31
|
Merge branch '80-edit-my-profile' into 'staging'
Resolve "Edit my profile"
See merge request startinblox/applications/sib-app!49
|
2019-06-27 11:16:15 +00:00 |
|
|
Jean-Baptiste Pasquier
|
0b0314dc3c
|
feature: Header dropdown & css
|
2019-06-26 19:15:05 +02:00 |
|
|
Jean-Baptiste Pasquier
|
2ce14a72eb
|
fix: css badge
|
2019-06-25 10:25:43 +02:00 |
|