 Jean-Baptiste Pasquier
|
fa9e8317bc
|
Merge branch 'master' of git.startinblox.com:applications/sib-app into release/profile-directory
|
2020-04-16 15:03:53 +02:00 |
|
|
Jean-Baptiste Pasquier
|
9b577fb894
|
Merge remote-tracking branch 'origin/bugfix/missing_content_login' into release/profile-directory
|
2020-04-16 14:39:54 +02:00 |
|
|
Jean-Baptiste Pasquier
|
db87a2af6f
|
Merge branch 'release/profile-directory' of git.startinblox.com:applications/sib-app into release/profile-directory
|
2020-04-16 14:30:52 +02:00 |
|
|
Jean-Baptiste Pasquier
|
019e8b99a6
|
feature: user administration
|
2020-04-16 14:30:31 +02:00 |
|
|
Jean-Baptiste Pasquier
|
df66f7f107
|
Merge branch 'feature/user-admin' into 'release/profile-directory'
Feature/user admin
See merge request applications/sib-app!129
|
2020-04-13 17:02:51 +00:00 |
|
|
Jean-Baptiste Pasquier
|
418812574d
|
Merge branch 'feature/user-admin' into 'release/profile-directory'
User administration, list create and edit
See merge request applications/sib-app!122
|
2020-04-08 10:57:05 +00:00 |
|
|
Jean-Baptiste Pasquier
|
23116d81ca
|
feature: user administration
|
2020-04-08 10:57:05 +00:00 |
|
|
Jean-Baptiste Pasquier
|
d2c8226048
|
Merge branch 'bugfix/446-fix-badges-workaround' into 'master'
bugfix: wait for notification menu to add listener
See merge request applications/sib-app!127
|
2020-04-07 17:49:49 +00:00 |
|
|
Jean-Baptiste Pasquier
|
775bf6b222
|
Merge branch 'release/profile-directory' of git.startinblox.com:applications/sib-app into release/profile-directory
|
2020-04-07 13:37:14 +02:00 |
|
|
Jean-Baptiste Pasquier
|
dac639ffec
|
Merge branch 'imporve-server' into 'master'
update: allow access from any url
See merge request applications/sib-app!126
|
2020-04-03 12:58:36 +00:00 |
|
|
Jean-Baptiste Pasquier
|
4e3e2a0c66
|
Merge branch 'feature/clean-up' into 'release/profile-directory'
Feature/clean up
See merge request applications/sib-app!125
|
2020-04-02 16:09:23 +00:00 |
|
|
Jean-Baptiste Pasquier
|
2497b502ad
|
cicd: fix alpha and add community
|
2020-04-01 16:08:27 +00:00 |
|
|
Jean-Baptiste Pasquier
|
74dfec5a5e
|
Merge branch 'feature/matomo' into 'release/profile-directory'
update: add Matomo and Google analytics + Rewrite readme for a complete configuration
See merge request applications/sib-app!123
|
2020-04-01 10:13:36 +00:00 |
|
|
Jean-Baptiste Pasquier
|
e62d32e6ae
|
update: add Matomo and Google analytics + Rewrite readme for a complete configuration
|
2020-04-01 12:12:55 +02:00 |
|
|
Jean-Baptiste Pasquier
|
fe641dcae7
|
Merge branch 'rachel-master-patch-51674' into 'staging'
A proposal for some changes in the bug template
See merge request startinblox/applications/sib-app!109
|
2020-02-27 15:00:20 +00:00 |
|
|
Jean-Baptiste Pasquier
|
1a0f0346ae
|
fix: hd-counter
|
2020-02-26 22:56:42 +01:00 |
|
|
Jean-Baptiste Pasquier
|
5f66a59c68
|
fix: badge url
|
2020-02-26 22:51:30 +01:00 |
|
|
Jean-Baptiste Pasquier
|
e1b64c152a
|
minor: upgrade to sib-chat@0.5 (converse in fullscreen)
|
2020-02-26 00:30:03 +01:00 |
|
|
Jean-Baptiste Pasquier
|
9062babe0a
|
fix: capabilities for directory
|
2020-02-24 14:27:25 +00:00 |
|
|
Jean-Baptiste Pasquier
|
dd94f4370b
|
Merge branch 'cleanup-optimise-perfs' into 'staging'
Cleanup & optimise perfs
Closes #292 and #388
See merge request startinblox/applications/sib-app!115
|
2020-02-24 14:13:26 +00:00 |
|
|
Jean-Baptiste Pasquier
|
3e14cb91a4
|
update: redirect to login and hide page on logged out
|
2020-02-19 17:03:47 +01:00 |
|
|
Jean-Baptiste Pasquier
|
8042b179c6
|
fix: recursiveAdaptWidgets
|
2020-02-19 16:27:22 +01:00 |
|
|
Jean-Baptiste Pasquier
|
e1bce61124
|
perf: improve circle admin
|
2020-02-10 17:58:03 +01:00 |
|
|
Jean-Baptiste Pasquier
|
31bd34df98
|
sorted src, activate condition for public directory and job offers, dev parameter for local lib folder
|
2020-02-10 13:59:23 +01:00 |
|
|
Jean-Baptiste Pasquier
|
b512cf3e9a
|
Merge branch 'update-event' into 'staging'
Update event
See merge request startinblox/applications/sib-app!113
|
2020-02-10 12:22:53 +00:00 |
|
|
Jean-Baptiste Pasquier
|
3551794d40
|
remove dependencies changes
|
2020-02-10 12:22:20 +00:00 |
|
|
Jean-Baptiste Pasquier
|
2d13f28195
|
Merge branch 'circle-leaving-refresh-redirect' into 'staging'
Refreshing sib-displays in absence of reactive store
See merge request startinblox/applications/sib-app!114
|
2020-02-05 12:39:29 +00:00 |
|
|
Jean-Baptiste Pasquier
|
c15afa496f
|
Merge branch 'extends-config-json' into 'staging'
Extends config json
See merge request startinblox/applications/sib-app!112
|
2020-02-03 17:39:25 +00:00 |
|
|
Jean-Baptiste Pasquier
|
80d6ca10bb
|
Merge branch 'extends-config-json' into 'staging'
Adapted Sib App for ETUC & more flexible way to handle optional components
See merge request startinblox/applications/sib-app!110
|
2020-02-03 15:16:42 +00:00 |
|
|
Jean-Baptiste Pasquier
|
2bf2206634
|
update readme for typeevent and uploads
|
2020-02-03 16:16:23 +01:00 |
|
|
Jean-Baptiste Pasquier
|
239645eda2
|
update: add upload-src and range-typeevents
|
2020-02-03 16:07:32 +01:00 |
|
|
Jean-Baptiste Pasquier
|
d5e19c469c
|
update: add events component
|
2020-02-03 15:43:16 +01:00 |
|
|
Jean-Baptiste Pasquier
|
0f43e021f2
|
fix: no endpoint for clientCSS
|
2020-02-03 14:47:58 +01:00 |
|
|
Jean-Baptiste Pasquier
|
7eff652d5d
|
Adapted Sib App for ETUC & more flexible way to handle optional components
|
2020-02-03 14:39:14 +01:00 |
|
|
Jean-Baptiste Pasquier
|
d37796f86f
|
Merge branch 'circle-perf-fix' into 'master'
Circle perf fix
See merge request startinblox/applications/sib-app!108
|
2020-01-27 12:30:31 +00:00 |
|
|
Jean-Baptiste Pasquier
|
9562289e53
|
fix: css for left menu
|
2020-01-27 13:29:54 +01:00 |
|
|
Jean-Baptiste Pasquier
|
fb703e7246
|
fix: move next to parent
|
2020-01-27 13:18:28 +01:00 |
|
|
Jean-Baptiste Pasquier
|
7277983e08
|
fix: left menu circle on widget
|
2020-01-24 19:30:36 +01:00 |
|
|
Jean-Baptiste Pasquier
|
e4d9fae0f3
|
Merge branch 'staging' into circle-perf-fix
|
2020-01-24 17:58:43 +01:00 |
|
|
Jean-Baptiste Pasquier
|
f9e9a5d75e
|
Merge branch 'gm-admin-tag-fix' into 'staging'
project: admin tag displayed when it is needed + some CSS
See merge request startinblox/applications/sib-app!107
|
2020-01-22 15:36:16 +00:00 |
|
|
Jean-Baptiste Pasquier
|
ae3d6cb282
|
try to set menu to user container
|
2020-01-20 14:35:09 +01:00 |
|
|
Jean-Baptiste Pasquier
|
541ace4e3f
|
Merge branch 'responsive-fix' into 'staging'
Responsive fixes
See merge request startinblox/applications/sib-app!106
|
2020-01-20 12:59:02 +00:00 |
|
|
Jean-Baptiste Pasquier
|
83e6957934
|
fix a lot of problems and add js for menus
|
2020-01-20 13:57:03 +01:00 |
|
|
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 |
|