aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-11-0831-74/+162
|\
| * Merge branch 'cherry-pick-fa437b79' into 'dev'Max Kostikov2019-11-081-1/+1
| |\ | | | | | | | | | | | | more fix date header format See merge request hubzilla/core!1776
| | * more fix date header formatMario2019-11-081-1/+1
| |/ | | | | (cherry picked from commit fa437b7977ba7fffd7368fa5c75e3d57fbf75424)
| * Merge branch 'cherry-pick-bb11cd15' into 'dev'Max Kostikov2019-11-081-1/+1
| |\ | | | | | | | | | | | | fix date header format See merge request hubzilla/core!1775
| | * fix date header formatMario2019-11-081-1/+1
| |/ | | | | (cherry picked from commit bb11cd15d147ebbcc90b544788c9c2ef4925daa5)
| * Merge branch 'dev' into 'dev'Max Kostikov2019-11-081-1/+1
| |\ | | | | | | | | | | | | Do not trim a sufficiently shortened Opengraph description See merge request hubzilla/core!1774
| | * Do not trim a sufficiently shortened Opengraph descriptionMax Kostikov2019-11-081-1/+1
| | |
| * | Merge branch 'cherry-pick-2df15f35' into 'dev'Max Kostikov2019-11-0828-71/+159
| |\ \ | | | | | | | | | | | | | | | | update composer libs See merge request hubzilla/core!1773
| | * | update composr libsMario2019-11-0828-71/+159
| |/ / | | | | | | (cherry picked from commit 2df15f35d706d4608ff723ce6288391ca774f7ba)
| * | Merge branch 'dev' into 'dev'Mario2019-11-084-1/+209
| |\ \ | | | | | | | | | | | | | | | | svg stuff See merge request hubzilla/core!1772
| | * | svg stuffZot2019-11-084-1/+209
| |/ /
* | | exempt svg from tag completionzotlabs2019-11-082-7/+9
| | |
* | | svg stuffzotlabs2019-11-074-1/+209
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-11-075-181/+279
|\| |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-11-072-172/+253
| |\| | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1771
| | * Update hstrings.phpMax Kostikov2019-11-071-2/+15
| | |
| | * Update hmessages.poMax Kostikov2019-11-071-170/+238
| | |
| | * Move title sanitizer code in the right placeMax Kostikov2019-11-061-12/+12
| | |
| | * FormattingMax Kostikov2019-11-061-1/+1
| | |
| | * Update feedutils.phpMax Kostikov2019-11-061-9/+9
| | |
| | * Sanitize title on Atom/RSS feed importMax Kostikov2019-11-061-0/+12
| | |
| * | Merge branch 'dev' into 'dev'Mario2019-11-071-0/+12
| |\ \ | | | | | | | | | | | | | | | | Sanitize title on Atom/RSS feed import See merge request hubzilla/core!1770
| | * | Sanitize title on Atom/RSS feed importMax Kostikov2019-11-071-0/+12
| |/ /
| * | 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 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-11-0430-92/+15061
|\| | |
| * | | 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
| | |