aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Merge branch 'dev' into 'dev'Max Kostikov2019-06-101-2/+2
| |\
| | * PgSQL compatibility on conversionMax Kostikov2019-06-101-2/+2
| |/
* / fix storageconv issue with postgresMario2019-06-101-2/+5
|/
* fix css issueMario Vavti2019-06-071-1/+1
* fix embedphotos image sizeMario Vavti2019-06-071-1/+1
* update changelogMario Vavti2019-06-041-1/+1
* do not change default timezone in parse_ical_file()Mario Vavti2019-06-031-9/+0
* fix timezone issue when importing adjusted eventsMario Vavti2019-06-031-7/+13
* regard timezones in calendar import/exportMario2019-06-032-5/+26
* update changelogMario Vavti2019-06-031-1/+3
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-311-2/+1
|\
| * fix category widget when using articleszotlabs2019-05-311-2/+1
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-2/+2
|\|
| * live-update not triggering on mod_searchzotlabs2019-05-291-2/+2
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-1/+1
|\ \ | |/ |/|
| * Add single photo URL rewrite for clonned channelMax Kostikov2019-05-301-1/+1
* | Merge branch 'dev' into 'dev'Mario2019-05-294-21/+38
|\ \
| * | anomolies in calls to datetime_convert in include/importzotlabs2019-05-281-6/+6
| * | convert AS "instrument" objects to the more appropriate "generator" - this pr...zotlabs2019-05-281-14/+14
| * | Revert "another forum -> group wording change" (wrong tree)zotlabs2019-05-281-3/+3
| * | support 'expires' over Zot6zotlabs2019-05-283-1/+18
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-2821-1462/+1760
| |\ \ | |/ / |/| |
* | | update changelogMario Vavti2019-05-281-0/+56
* | | mod cal band-aid fixesMario Vavti2019-05-263-16/+26
* | | adjust birthday handling according to community decision and slightly change ...Mario Vavti2019-05-267-33/+30