Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'cherry-pick-7cc8c2d1' into 'dev' | M. Dent | 2019-11-06 | 1 | -6/+11 |
|\ | | | | | | | | | port fixes from zap to check for arrays See merge request hubzilla/core!1767 | ||||
| * | port fixes from zap to check for arrays | Mario | 2019-11-04 | 1 | -6/+11 |
| | | | | | | (cherry picked from commit 7cc8c2d127b09b7e53c7916c6ea104fa566971db) | ||||
* | | Merge branch 'cherry-pick-3604220c' into 'dev' | M. Dent | 2019-11-06 | 1 | -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 happy | Mario | 2019-11-04 | 1 | -2/+2 |
| |/ | | | | | (cherry picked from commit 3604220c2a5aedddf25143cc5fd87ed576d34702) | ||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2019-11-06 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Prefer use Etag on photo modification validation See merge request hubzilla/core!1769 | ||||
| * | | Prefer use Etag on photo modification validation | Max Kostikov | 2019-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'cherry-pick-4cfb9658' into 'dev' | M. Dent | 2019-11-04 | 2 | -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 upload | Mario | 2019-11-04 | 2 | -7/+2 |
| | |/ | |/| | | | | (cherry picked from commit 4cfb965881df2be181aab6020c9df78c0a86fd9f) | ||||
* | | | Merge branch 'cherry-pick-03317b98' into 'dev' | M. Dent | 2019-11-04 | 1 | -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 xchan | Mario | 2019-11-04 | 1 | -1/+1 |
|/ / | | | | | (cherry picked from commit 03317b9864c0d7c99e144404c647b9923d8d29ea) | ||||
* | | Merge branch 'cherry-pick-4a1c2208' into 'dev' | Max Kostikov | 2019-11-03 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | fix issue #1402 See merge request hubzilla/core!1764 | ||||
| * | | fix issue #1402 | Mario | 2019-11-03 | 1 | -2/+3 |
|/ / | | | | | (cherry picked from commit 4a1c2208866360b5fe54eea71ff8e62bd6d63045) | ||||
* | | Merge branch 'commentsclosed-hook' into 'dev' | Mario | 2019-11-03 | 3 | -0/+33 |
|\ \ | | | | | | | | | | | | | Add hook to comments_are_now_closed() See merge request hubzilla/core!1763 | ||||
| * | | Add hook to comments_are_now_closed() | M. Dent | 2019-11-03 | 3 | -0/+33 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-11-02 | 3 | -4/+2 |
|\| | | | | | | | | | Change llink type in default SQL schema See merge request hubzilla/core!1761 | ||||
| * | Fix start time to sync queries on photo cache purge | Max Kostikov | 2019-11-02 | 1 | -1/+1 |
| | | |||||
| * | Update schema_mysql.sql | Max Kostikov | 2019-11-01 | 1 | -1/+1 |
| | | |||||
| * | Drop llink index | Max Kostikov | 2019-11-01 | 1 | -1/+0 |
| | | |||||
| * | Change llink column type and drop index | Max Kostikov | 2019-11-01 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'homeinstall_fix_addons' into 'dev' | Max Kostikov | 2019-11-02 | 1 | -2/+2 |
|\ \ | | | | | | | | | | | | | homeinstall fix addons See merge request hubzilla/core!1762 | ||||
| * | | homeinstall fix addons | root | 2019-11-01 | 1 | -2/+2 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-11-01 | 1 | -10/+6 |
|\| | | | | | | | | | Better photo cache expiry processing See merge request hubzilla/core!1760 | ||||
| * | Add missed interval in SQL query | Max Kostikov | 2019-11-01 | 1 | -1/+1 |
| | | |||||
| * | Better photo cache expiry processing | Max Kostikov | 2019-11-01 | 1 | -10/+6 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-26 | 1 | -12/+4 |
|\| | | | | | | | | | Better cached photos processing See merge request hubzilla/core!1759 | ||||
| * | Update Photo.php | Max Kostikov | 2019-10-26 | 1 | -1/+1 |
| | | |||||
| * | Better cached photos processing | Max Kostikov | 2019-10-26 | 1 | -13/+5 |
| | | |||||
* | | fix hardcoded code/pre css in mod admin | Mario | 2019-10-22 | 1 | -18/+0 |
| | | | | | | (cherry picked from commit cddf6c4ff51580f3dec5d32eef06a40a473a9202) | ||||
* | | fix encoding issue | Mario | 2019-10-22 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit 067010fc0a5a6c10825b869b822c9cfbb3d4516b) | ||||
* | | Merge branch 'patch-1' into 'dev' | Max Kostikov | 2019-10-19 | 3 | -0/+14886 |
|\ \ | | | | | | | | | | | | | add japanese translation See merge request hubzilla/core!1752 | ||||
| * | | Update view/ja/hstrings.php | harukin | 2019-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | Update view/ja/hmessages.po, view/ja/hstrings.php files | harukin | 2019-10-17 | 2 | -2/+8 |
| | | | |||||
| * | | Upload .php file | harukin | 2019-10-14 | 1 | -0/+2791 |
| | | | |||||
| * | | Upload .po file | harukin | 2019-10-14 | 1 | -0/+12089 |
| | | | |||||
| * | | japanese translation directory | harukin | 2019-10-14 | 1 | -0/+0 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-15 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Fix channel address in follow link See merge request hubzilla/core!1757 | ||||
| * | | Fix channel address in follow link | Max Kostikov | 2019-10-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-15 | 1 | -3/+7 |
|\| | | | | | | | | | | | | | | Better Opengraph image type detection See merge request hubzilla/core!1756 | ||||
| * | | Update opengraph.php | Max Kostikov | 2019-10-15 | 1 | -2/+2 |
| | | | |||||
| * | | Better Opengraph image type detection | Max Kostikov | 2019-10-15 | 1 | -3/+7 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-15 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | Dev See merge request hubzilla/core!1755 | ||||
| * | | Fix cache-control syntax for photos | Max Kostikov | 2019-10-15 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-15 | 3 | -5/+11 |
| |\ \ | |/ / |/| | | | | | | | | Sync dev See merge request kostikov/core!3 | ||||
* | | | Merge branch 'patch-20191014' into 'dev' | Max Kostikov | 2019-10-14 | 3 | -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. Dent | 2019-10-14 | 3 | -5/+11 |
|/ / / | | | | | | | | | | infrastructure caches (CDN) | ||||
* | / | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-14 | 1 | -1/+1 |
|\| | | |/ |/| | | | | | Better plural function detection See merge request hubzilla/core!1753 | ||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-10-14 | 1 | -3/+7 |
| |\ | |/ |/| | | | | | Dev See merge request kostikov/core!2 | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-10-13 | 3 | -18/+86 |
|\ \ | | | | | | | | | | | | | Better Opengraph markup See merge request hubzilla/core!1751 | ||||
| * | | Revert "Remove visible channels list from pubstream tags cloud creation ↵ | Max Kostikov | 2019-10-13 | 3 | -18/+86 |
|/ / | | | | | | | | | | | procedure" This reverts commit 5c4c6e68f600d50deed8ddb32dd6702af9b52853 | ||||
* | | Merge branch 'cherry-pick-cac0672a' into 'dev' | M. Dent | 2019-10-08 | 1 | -3/+7 |
|\ \ | | | | | | | | | | | | | issue #1401 See merge request hubzilla/core!1750 |