Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Authored by ronaldv on Jun 4 2019, 8:59 AM.

Description

Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Details

Committed
ronaldvJun 4 2019, 8:59 AM
Parents
R767:6d78b2c6ebd4: dls
R767:0627f477668e: cttgcl fix
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
0627f477668eDavid Nelband
cttgcl fix 
Jun 3 2019
3ed5238ed0efDavid Nelband
cttg fix 
Jun 3 2019
9e9541b8dd42David Nelband
category tree tag cloud 
Jun 3 2019
d77c5c464e61David Nelband
category tree tag cloud 
Jun 3 2019
a0ee521f2797David Nelband
category tree with tags 
Jun 3 2019
304d5f411759David Nelband
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
Jun 3 2019
ae12a84e376eDavid Nelband
embeded fix pms 
Jun 3 2019
30bf7c0e6910siyuandong
json 
Jun 3 2019
b559d5f64d84David Nelband
pms embeded fix 
Jun 3 2019
d9133414a451David Nelband
pms embeded fix 
Jun 3 2019
0e9e86b3e3f1David Nelband
pms embed media fix 
Jun 3 2019
afcd83c9a922David Nelband
Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev 
Jun 3 2019
3b5cda72feceDavid Nelband
pms iframe display 
Jun 3 2019
0f911df6dd1esiyuandong
userbackend title 
Jun 3 2019
68785e2bd3e6siyuandong
userbackend title 
Jun 3 2019