aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* improve channel date queryMario Vavti2019-04-271-11/+7
* possible sql performance improvementMario Vavti2019-04-271-1/+1
* update changelogMario Vavti2019-04-261-0/+11
* Merge branch 'dev' into 'dev'Mario2019-04-262-6/+48
|\
| * import/export zot6 hublocs+xchansZot2019-04-262-6/+48
|/
* Merge branch 'dev' into 'dev'Mario2019-04-261-3/+4
|\
| * update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to mas...Zot2019-04-261-3/+4
|/
* Merge branch 'dev' into 'dev'Mario2019-04-256-28/+89
|\
| * hubloc confusion in magic authZot2019-04-256-28/+89
|/
* update blueimp/jquery-file-uploadMario Vavti2019-04-257-26/+34
* add missing filesMario Vavti2019-04-252-0/+15
* update sabre/vobjectMario Vavti2019-04-2591-3752/+2831
* Revert "update composer libs"Mario2019-04-25102-3125/+3985
* Revert "fix test"Mario2019-04-251-2/+2
* Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9"Mario2019-04-252-3/+3
* dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9Mario Vavti2019-04-252-3/+3
* fix testMario Vavti2019-04-251-2/+2
* update composer libsMario Vavti2019-04-25102-3985/+3125
* Merge branch 'dev' into 'dev'Mario2019-04-241-14/+21
|\
| * Optimize cached photos processingMax Kostikov2019-04-241-11/+13
| * Add modified date in Etag hash calculationMax Kostikov2019-04-241-3/+8
* | calendar merge: bring back event categoriesMario Vavti2019-04-244-33/+52
* | Merge branch 'update-docs' into 'dev'Max Kostikov2019-04-221-105/+164
|\ \
| * | Tidy up various bits of documentationDaniel Lowe2019-04-221-87/+163
| * | Remove section on techlevelsDaniel Lowe2019-04-221-18/+1
* | | Merge branch 'fix-infinite-loop' into 'dev'Max Kostikov2019-04-221-12/+6
|\ \ \ | |/ / |/| |
| * | Fix infinite loop using postgres as backendDaniel Lowe2019-04-211-12/+6
|/ /
* | Merge branch 'calendar_merge' into 'dev'Max Kostikov2019-04-2010-52/+872
|\ \
| * \ resolve merge conflictMario Vavti2019-04-203-2/+3
| |\ \ | |/ / |/| |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
|\ \ \ | | |/ | |/|
| * | Add anti SEO link properties in directory listingMax Kostikov2019-04-191-1/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-2/+2
|\| |
| * | Update cdav_calendar.tplMax Kostikov2019-04-191-2/+2
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-0/+1
|\| |
| * | Add translation to update buttonMax Kostikov2019-04-191-0/+1
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-1/+1
|\| |
| * | Add translation to update buttonMax Kostikov2019-04-191-1/+1
| | * Merge branch 'dev' into calendar_mergeMario Vavti2019-04-192-6/+33
| | |\ | |_|/ |/| |
* | | Merge branch 'dev' into 'dev'Mario2019-04-192-6/+33
|\| |
| * | Add remove profile photo buttonMax Kostikov2019-04-191-4/+30
| * | Add remove profile photo buttonMax Kostikov2019-04-191-2/+3
| | * provide location and description informationMario Vavti2019-04-192-6/+13
| | * provide link to source and some cleanupMario Vavti2019-04-195-145/+17
| | * Merge branch 'dev' into calendar_mergeMario Vavti2019-04-197-407/+135
| | |\ | |_|/ |/| |
* | | Merge branch 'dev' into 'dev'Mario2019-04-191-1/+1
|\ \ \
| * | | required php version not available but allowed to continuezotlabs2019-04-181-1/+1
* | | | Merge branch 'dev' into 'dev'Mario2019-04-191-30/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Update Photo.phpMax Kostikov2019-04-181-1/+1
| * | | Update Photo.phpMax Kostikov2019-04-181-2/+4
| * | | Implement ETag: header support for cache controlMax Kostikov2019-04-181-15/+14