aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Resolved merge conflictsManuel Jiménez Friaza2018-11-2454-1060/+1770
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario2018-11-231-1/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario2018-11-233-18/+20
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge remote-tracking branch 'mike/master' into devMario2018-11-223-5/+8
| |\ \ \ \ \
| * | | | | | fix call to undefined functionMario Vavti2018-11-211-1/+1
| * | | | | | Merge branch 'dev' into 'dev'Mario2018-11-202-712/+693
| |\ \ \ \ \ \
| | * | | | | | Replace hmessages.poMax Kostikov2018-11-191-688/+673
| | * | | | | | Replace hstrings.phpMax Kostikov2018-11-191-24/+20
| * | | | | | | Revert "Fix return on wrong sotred in Content-Length size for full size photos"Mario2018-11-191-4/+2
| * | | | | | | Revert "Add filesize for streaming content"Mario2018-11-191-1/+0
| * | | | | | | changelogMario Vavti2018-11-191-0/+9
| * | | | | | | update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
| * | | | | | | Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Fix: delayed items propagate before publication on cloned channelsDM42.Net (Matt Dent)2018-11-181-2/+0
| * | | | | | | | Merge branch 'mod-zot-fix' into 'dev'Max Kostikov2018-11-181-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | fix typo which prevented propagation of commentsMario Vavti2018-11-181-1/+1
| |/ / / / / / /
| * | | | | | | recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| * | | | | | | Add filesize for streaming contentMax Kostikov2018-11-161-0/+1
| * | | | | | | Fix return on wrong sotred in Content-Length size for full size photosMax Kostikov2018-11-161-2/+4
| * | | | | | | strlen($this->imageString()) does not return the correct size when dealing wi...Mario Vavti2018-11-161-2/+2
| * | | | | | | Merge branch 'dev_homeinstall_raspihub' into 'dev'Mario2018-11-163-18/+46
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'official/dev' into dev_homeinstall_raspihubOJ Random2018-11-141-1/+1
| | |\ \ \ \ \ \ \
| | * | | | | | | | localhost, URLs, version updatesOJ Random2018-11-143-18/+46
| * | | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-11-1618-121/+75
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fix update 1228Mario Vavti2018-11-151-1/+0
| | | | | | | | | * | fix call to undefined functionMario Vavti2018-11-211-1/+1
| | | | | | | | | * | fix typo which prevented propagation of commentsMario Vavti2018-11-201-1/+1
| | | | | | | | | * | version 3.8.53.8.5Mario Vavti2018-11-191-1/+1
| | | | | | | | | * | Merge branch 'master' of https://framagit.org/hubzilla/coreMario Vavti2018-11-191-2/+0
| | | | | | | | | |\ \
| | | | | | | | | | * | Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
| | | | | | | | | * | | changelogMario Vavti2018-11-191-0/+9
| | | | | | | | | |/ /
| | | | | | | | | * | update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
| | | | | | | | | * | recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| | | | | | | | | * | strlen($this->imageString()) does not return the correct size when dealing wi...Mario Vavti2018-11-161-2/+2
| | | | | | | | | * | Merge branch 'master' into 'master'Mario2018-11-161-3/+3
| | | | |_|_|_|_|/| | | | | |/| | | | | | |
| | | | | | | | | * | delivery issuezotlabs2018-11-151-3/+3
| | | | |_|_|_|_|/ / | | | |/| | | | | |
* | | | | | | | | | more mergingzotlabs2018-12-031-9/+67
* | | | | | | | | | more work on z6 commentingzotlabs2018-12-033-64/+268
* | | | | | | | | | fix generated plinkzotlabs2018-12-031-3/+3
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | typozotlabs2018-11-301-1/+1
* | | | | | | | | allow notification filtering by name or addrzotlabs2018-11-304-8/+16
* | | | | | | | | attached photo permissions regressionzotlabs2018-11-301-4/+4
* | | | | | | | | prevent incompatible export files (osada/zap) from being imported. This is to...zotlabs2018-11-272-0/+32
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Organization actor type was missingzotlabs2018-11-231-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | use uuid in file storagezotlabs2018-11-222-3/+3
* | | | | | | fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
| |_|_|_|_|/ |/| | | | |
* | | | | | no mention notifications from mastodon (and pleroma)zotlabs2018-11-212-5/+5
* | | | | | use this form insteadzotlabs2018-11-191-2/+1
* | | | | | push recent changeszotlabs2018-11-193-2/+6
| |/ / / / |/| | | |
* | | | | datetime_convert wrong argszotlabs2018-11-152-2/+2