aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* make pdf preview 100% width and 300px height to match it openstreetmaps previewMario Vavti2018-12-011-1/+5
* Merge branch 'es-es' into 'dev'M. Dent2018-11-281-14/+21
|\
| * Merge branch 'cherry-pick-5ac08ec3' into 'es-es'Manuel Jiménez Friaza2018-11-261-14/+21
| |\
| | * Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
| |/
* | Merge branch 'default2flex-conversion' into 'dev'M. Dent2018-11-283-17/+35
|\ \
| * | use flex for the default templateMario2018-11-263-17/+35
* | | Merge branch 'composer-updates' into 'dev'M. Dent2018-11-2819-118/+139
|\ \ \
| * | | update jquery-file-upload and psr-log via composerMario2018-11-2521-175/+164
* | | | Merge branch 'update-imagesloaded' into 'dev'M. Dent2018-11-2840-98/+1870
|\ \ \ \
| * | | | update imagesloaded to version 4.1.4 via composerMario2018-11-2540-98/+1870
| |/ / /
* | | | Merge branch 'pg-fixes' into 'dev'M. Dent2018-11-281-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | fix db upgrade 1228 for postgresMario2018-11-221-2/+2
* | | | Merge branch 'patch-20181120a' into 'dev'Mario2018-11-251-0/+5
|\ \ \ \
| * | | | Do not store serialized pconfig value received via to Module/Pconfig.phpM. Dent2018-11-251-0/+5
|/ / / /
* | | | Merge branch 'es-es' into 'dev'Mario2018-11-242-27/+27
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Update es-esManuel Jiménez Friaza2018-11-242-27/+27
| * | Resolved merge conflictsManuel Jiménez Friaza2018-11-2454-1060/+1770
| |\ \ | |/ / |/| |
* | | Merge remote-tracking branch 'mike/master' into devMario2018-11-231-1/+1
|\ \ \
| * | | Organization actor type was missingzotlabs2018-11-231-1/+1
* | | | Merge remote-tracking branch 'mike/master' into devMario2018-11-233-18/+20
|\| | | | |_|/ |/| |
| * | use uuid in file storagezotlabs2018-11-222-3/+3
| * | fix mastodon tag notifications (again)zotlabs2018-11-211-15/+17
* | | Merge remote-tracking branch 'mike/master' into devMario2018-11-223-5/+8
|\| |
| * | 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
* | | 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
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | datetime_convert wrong argszotlabs2018-11-152-2/+2
| * | | | | more work on the mid/uuid conversionzotlabs2018-11-151-17/+19
| * | | | | delivery report issuezotlabs2018-11-151-2/+3
| * | | | | add item.uuid to relevant placeszotlabs2018-11-1511-32/+44
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 03:08:19 +0000