aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cherry-pick-7cc8c2d1' into 'dev'M. Dent2019-11-061-6/+11
|\ | | | | | | | | port fixes from zap to check for arrays See merge request hubzilla/core!1767
| * port fixes from zap to check for arraysMario2019-11-041-6/+11
| | | | | | (cherry picked from commit 7cc8c2d127b09b7e53c7916c6ea104fa566971db)
* | Merge branch 'cherry-pick-3604220c' into 'dev'M. Dent2019-11-061-2/+2
|\ \ | | | | | | | | | | | | add date and request target headers to make pixelfed happy See merge request hubzilla/core!1768
| * | add date and request target headers to make pixelfed happyMario2019-11-041-2/+2
| |/ | | | | (cherry picked from commit 3604220c2a5aedddf25143cc5fd87ed576d34702)
* | Merge branch 'dev' into 'dev'M. Dent2019-11-061-1/+1
|\ \ | | | | | | | | | | | | Prefer use Etag on photo modification validation See merge request hubzilla/core!1769
| * | Prefer use Etag on photo modification validationMax Kostikov2019-11-041-1/+1
| | |
* | | Merge branch 'cherry-pick-4cfb9658' into 'dev'M. Dent2019-11-042-7/+2
|\ \ \ | | | | | | | | | | | | | | | | fix duplicate attachment and regression with audio file upload See merge request hubzilla/core!1766
| * | | fix duplicate attachment and regression with audio file uploadMario2019-11-042-7/+2
| | |/ | |/| | | | (cherry picked from commit 4cfb965881df2be181aab6020c9df78c0a86fd9f)
* | | Merge branch 'cherry-pick-03317b98' into 'dev'M. Dent2019-11-041-1/+1
|\ \ \ | |/ / |/| | | | | | | | fix query with protocol prefix not always picking the right xchan See merge request hubzilla/core!1765
| * | fix query with protocol prefix not always picking the right xchanMario2019-11-041-1/+1
|/ / | | | | (cherry picked from commit 03317b9864c0d7c99e144404c647b9923d8d29ea)
* | Merge branch 'cherry-pick-4a1c2208' into 'dev'Max Kostikov2019-11-031-2/+3
|\ \ | | | | | | | | | | | | fix issue #1402 See merge request hubzilla/core!1764
| * | fix issue #1402Mario2019-11-031-2/+3
|/ / | | | | (cherry picked from commit 4a1c2208866360b5fe54eea71ff8e62bd6d63045)
* | Merge branch 'commentsclosed-hook' into 'dev'Mario2019-11-033-0/+33
|\ \ | | | | | | | | | | | | Add hook to comments_are_now_closed() See merge request hubzilla/core!1763
| * | Add hook to comments_are_now_closed()M. Dent2019-11-033-0/+33
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2019-11-023-4/+2
|\| | | | | | | | | Change llink type in default SQL schema See merge request hubzilla/core!1761
| * Fix start time to sync queries on photo cache purgeMax Kostikov2019-11-021-1/+1
| |
| * Update schema_mysql.sqlMax Kostikov2019-11-011-1/+1
| |
| * Drop llink indexMax Kostikov2019-11-011-1/+0
| |
| * Change llink column type and drop indexMax Kostikov2019-11-011-2/+1
| |
* | Merge branch 'homeinstall_fix_addons' into 'dev'Max Kostikov2019-11-021-2/+2
|\ \ | | | | | | | | | | | | homeinstall fix addons See merge request hubzilla/core!1762
| * | homeinstall fix addonsroot2019-11-011-2/+2
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2019-11-011-10/+6
|\| | | | | | | | | Better photo cache expiry processing See merge request hubzilla/core!1760
| * Add missed interval in SQL queryMax Kostikov2019-11-011-1/+1
| |
| * Better photo cache expiry processingMax Kostikov2019-11-011-10/+6
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-10-261-12/+4
|\| | | | | | | | | Better cached photos processing See merge request hubzilla/core!1759
| * Update Photo.phpMax Kostikov2019-10-261-1/+1
| |
| * Better cached photos processingMax Kostikov2019-10-261-13/+5
| |
* | fix hardcoded code/pre css in mod adminMario2019-10-221-18/+0
| | | | | | (cherry picked from commit cddf6c4ff51580f3dec5d32eef06a40a473a9202)
* | fix encoding issueMario2019-10-221-1/+1
| | | | | | (cherry picked from commit 067010fc0a5a6c10825b869b822c9cfbb3d4516b)
* | Merge branch 'patch-1' into 'dev'Max Kostikov2019-10-193-0/+14886
|\ \ | | | | | | | | | | | | add japanese translation See merge request hubzilla/core!1752
| * | Update view/ja/hstrings.phpharukin2019-10-191-1/+1
| | |
| * | Update view/ja/hmessages.po, view/ja/hstrings.php filesharukin2019-10-172-2/+8
| | |
| * | Upload .php fileharukin2019-10-141-0/+2791
| | |
| * | Upload .po fileharukin2019-10-141-0/+12089
| | |
| * | japanese translation directoryharukin2019-10-141-0/+0
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-1/+1
|\ \ \ | | |/ | |/| | | | | | | Fix channel address in follow link See merge request hubzilla/core!1757
| * | Fix channel address in follow linkMax Kostikov2019-10-151-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-3/+7
|\| | | | | | | | | | | | | | Better Opengraph image type detection See merge request hubzilla/core!1756
| * | Update opengraph.phpMax Kostikov2019-10-151-2/+2
| | |
| * | Better Opengraph image type detectionMax Kostikov2019-10-151-3/+7
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-2/+1
|\| | | | | | | | | | | | | | Dev See merge request hubzilla/core!1755
| * | Fix cache-control syntax for photosMax Kostikov2019-10-151-2/+1
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-10-153-5/+11
| |\ \ | |/ / |/| | | | | | | | Sync dev See merge request kostikov/core!3
* | | Merge branch 'patch-20191014' into 'dev'Max Kostikov2019-10-143-5/+11
|\ \ \ | | | | | | | | | | | | | | | | Updates to zcard/profile images and other public images to account for infrastructure caches (CDN) See merge request hubzilla/core!1754
| * | | Updates to zcard/profile images and other public images to account for ↵M. Dent2019-10-143-5/+11
|/ / / | | | | | | | | | infrastructure caches (CDN)
* | / Merge branch 'dev' into 'dev'Max Kostikov2019-10-141-1/+1
|\| | | |/ |/| | | | | Better plural function detection See merge request hubzilla/core!1753
| * Merge branch 'dev' into 'dev'Max Kostikov2019-10-141-3/+7
| |\ | |/ |/| | | | | Dev See merge request kostikov/core!2
* | Merge branch 'dev' into 'dev'Mario2019-10-133-18/+86
|\ \ | | | | | | | | | | | | Better Opengraph markup See merge request hubzilla/core!1751
| * | Revert "Remove visible channels list from pubstream tags cloud creation ↵Max Kostikov2019-10-133-18/+86
|/ / | | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853
* | Merge branch 'cherry-pick-cac0672a' into 'dev'M. Dent2019-10-081-3/+7
|\ \ | | | | | | | | | | | | issue #1401 See merge request hubzilla/core!1750