aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-0/+1
|\
| * Remove cached photo location directory on delete if emptyMax Kostikov2019-06-191-0/+1
* | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\|
| * Use html_entity_decode() for cached photo URLMax Kostikov2019-06-191-1/+1
* | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\|
| * Update zid.phpMax Kostikov2019-06-191-1/+1
| * Include Zot6 hubs in the Grid scopeMax Kostikov2019-06-181-1/+1
* | Merge branch 'dev' into 'dev'Max Kostikov2019-06-184-13843/+15287
|\|
| * Update hstrings.phpMax Kostikov2019-06-181-13/+14
| * Update hmessages.poMax Kostikov2019-06-181-551/+553
| * Update hstrings.phpMax Kostikov2019-06-181-2566/+2805
| * Update hmessages.poMax Kostikov2019-06-181-10713/+11915
* | Merge branch 'dev' into 'dev'Max Kostikov2019-06-181-1/+1
|\|
| * Fix os_path replace for thumbnailsMax Kostikov2019-06-181-1/+1
| * Merge branch 'dev' into 'dev'Max Kostikov2019-06-1833-18085/+407
| |\ | |/ |/|
* | Avoid to process original images using storeThumbnailMax Kostikov2019-06-181-3/+7
* | Merge branch 'dev' into 'dev'Mario2019-06-183-3/+3
|\ \
| * | minor zot6 compatibility issues uncovered through daily usezotlabs2019-06-173-3/+3
* | | fix typoMario Vavti2019-06-181-2/+2
* | | update composer libsMario Vavti2019-06-179-87/+125
* | | changelog and versionMario Vavti2019-06-172-1/+16
* | | disable events module. it is now disfunctionalMario Vavti2019-06-172-8/+6
* | | remove old fullcalendar libraryMario Vavti2019-06-1712-17676/+0
* | | update feature setMario Vavti2019-06-172-15/+1
* | | revisit mod calMario Vavti2019-06-173-290/+247
* | | Merge branch 'dev' into 'dev'Mario2019-06-155-6/+15
|\ \ \ | | |/ | |/|
| * | base64 encode message signatureMax Kostikov2019-06-151-1/+1
| * | Add base64 decode if signature encodedMax Kostikov2019-06-151-0/+3
| * | FormattingMax Kostikov2019-06-141-1/+1
| * | Add signature when private message displayingMax Kostikov2019-06-141-1/+1
| * | Add signature when send private messageMax Kostikov2019-06-141-0/+1
| * | FormattingMax Kostikov2019-06-141-1/+1
| * | Add signatures processing for private messagesMax Kostikov2019-06-141-0/+4
| * | Add signatures processing for private messagesMax Kostikov2019-06-141-3/+2
| * | Add signatures processing for private messagesMax Kostikov2019-06-141-2/+4
|/ /
* | fix mod cal regressionMario Vavti2019-06-141-2/+1
* | Merge branch 'dev' into 'dev'Mario2019-06-141-1/+3
|\|
| * zot6 protocol edge casezotlabs2019-06-131-1/+3
* | fix typoMario Vavti2019-06-141-1/+1
* | more work on linked item/resource deletion for photos and events, deprecate t...Mario Vavti2019-06-134-75/+54
* | port delete fixes from zapMario Vavti2019-06-122-20/+25
* | more work on event item deletionMario Vavti2019-06-123-1/+49
* | initial support for deleting event items if an event is removedMario Vavti2019-06-121-3/+62
* | Merge branch 'dev' into 'dev'Mario2019-06-122-6/+8
|\|
| * zot6 deletion issuezotlabs2019-06-111-1/+1
| * attach sync issueszotlabs2019-06-111-5/+7
* | Add resize on image scale to 4 and 7Max Kostikov2019-06-111-0/+2
|/
* remove sizeRangeSuffixes. they can cause issues with profile photos.Mario Vavti2019-06-101-10/+2
* add the thumbrepair scriptMario2019-06-101-0/+72
* resolve merge conflictMario2019-06-101-2/+2
|\