aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix filtering by addr in handleNotificationsItems()Mario Vavti2018-12-022-2/+3
| | | (cherry picked from commit f083c0cba10248926661db42d99d04b5eb7579e8)
* Merge branch 'pdf_embed_fixes' into 'dev'M. Dent2018-12-021-1/+5
|\ | | | | | | | | make pdf preview 100% width and 300px height to match it openstreetmaps preview See merge request hubzilla/core!1414
| * make pdf preview 100% width and 300px height to match it openstreetmaps previewMario Vavti2018-12-011-1/+5
| |
* | Merge branch 'sticky_aside_fixes' into 'dev'M. Dent2018-12-021-3/+3
|\ \ | | | | | | | | | | | | redbasic sticky aside fixes See merge request hubzilla/core!1415
| * | redbasic sticky aside fixesMario Vavti2018-12-011-3/+3
| |/
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-017-12/+52
|\ \ | |/ |/|
| * 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 ↵zotlabs2018-11-272-0/+32
| | | | | | | | to keep your DB from getting trashed. We probably need a similar thing for item import since the object formats aren't compatible
* | Merge branch 'es-es' into 'dev'M. Dent2018-11-281-14/+21
|\ \ | | | | | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request hubzilla/core!1410
| * \ Merge branch 'cherry-pick-5ac08ec3' into 'es-es'Manuel Jiménez Friaza2018-11-261-14/+21
| |\ \ | | | | | | | | | | | | | | | | Revision 1 doc/es-es/about/about.bb See merge request mjfriaza/core!3
| | * | Revision 1 doc/es-es/about/about.bbManuel Jiménez Friaza2018-11-261-14/+21
| |/ / | | | | | | (cherry picked from commit 5ac08ec3aa8ede14141390670a8097a60769e11e)
* | | Merge branch 'default2flex-conversion' into 'dev'M. Dent2018-11-283-17/+35
|\ \ \ | | | | | | | | | | | | | | | | use flex for the default template See merge request hubzilla/core!1409
| * | | 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 composer See merge request hubzilla/core!1408
| * | | | 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 composer See merge request hubzilla/core!1407
| * | | | | 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 postgres See merge request hubzilla/core!1403
| * | | | 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.php See merge request hubzilla/core!1402
| * | | | | 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-es See merge request hubzilla/core!1406
| * | | 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
| | | | | | | | | (cherry picked from commit 0bba9482dfbcc0fd8bea880ac3820548281ecfc2)
* | | Merge branch 'dev' into 'dev'Mario2018-11-202-712/+693
|\ \ \ | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1400
| * | | 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
| | | | | | | | | | | | This reverts commit 6010b5c6198bf49c39029a657443b5bf1be8b408
* | | | Revert "Add filesize for streaming content"Mario2018-11-191-1/+0
| | | | | | | | | | | | This reverts commit 238a616292ad5c6e7be97a4dd763a302729abf80
* | | | changelogMario Vavti2018-11-191-0/+9
| | | | | | | | | | | | (cherry picked from commit 5cb4cdaa5e42f87e9d26501150d6d689b56a1cd2)
* | | | update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
| | | | | | | | | | | | (cherry picked from commit ae97649948b8af575441e5a1f5b69db9f627a0e2)
* | | | Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398
| * | | | 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 comments See merge request hubzilla/core!1399
| * | | | fix typo which prevented propagation of commentsMario Vavti2018-11-181-1/+1
|/ / / /
* | | | recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
| | | | | | | | | | | | (cherry picked from commit f15e32d0637fdf84de7cab43b558ec8a383d3cf5)
* | | | 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
| | | |