aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | changelogMario2019-11-251-0/+67
| | | | | | | | | | | | | | | | | | (cherry picked from commit f6f7e7e8d2a9045ac2010ab2308ef7bc5e896efa)
| * | | | | resolve merge conflictMax Kostikov2019-11-253-9/+10
| |/ / / /
| * | | | merge opengraph fixes from devMario2019-11-253-68/+74
| | | | |
| * | | | no mention notifications from mastodon (and pleroma)Manuel Jiménez Friaza2019-11-212-14821/+14871
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ea235c0c6751b682332b968b4c18f905e8ece451) (cherry picked from commit 0159b631fcc2041009cc273b3f5308f06cee0429)
| * | | | onepoll: do not update dead feedsMario2019-11-152-5/+11
| | | | | | | | | | | | | | | (cherry picked from commit 5a6b14f8787927ee6ea99c622d02875811d3a74a)
| * | | | make inline pdf a security option, move thumbnail security to security ↵Mario2019-11-155-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | options from admin/site (cherry picked from commit de9a7f0fa909792656d26d369f2ff21c57fc1e4d)
| * | | | AP fixesMario2019-11-151-1/+7
| | | | | | | | | | | | | | | (cherry picked from commit 3009c88d246ddcafabf1965f88c5ebd8fe1717fd)
| * | | | check if file existsMario2019-11-131-1/+1
| | | | | | | | | | | | | | | (cherry picked from commit 52bd27a0280c736e563ccc67a9307cd75bd14d3f)
| * | | | wildcard tag issuezotlabs2019-11-131-0/+3
| | | | | | | | | | | | | | | (cherry picked from commit 2f4c619d510e64eeda05366e485d50f490cefebe)
| * | | | use minified version of jqueryMario2019-11-111-10598/+2
| |/ / / | | | | | | | | (cherry picked from commit 89342ca9fbf329d5e84839c51f26db19bdd4ac8c)
| * | | update stringsMario2019-11-111-8598/+8640
| | | |
| * | | bump versionMario2019-11-111-1/+1
| | | |
| * | | Merge branch 'cherry-pick-1affcb80' into 'dev'Mario2019-11-101-3/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | fix language tests See merge request hubzilla/core!1782
| | * | | fix language testsMario2019-11-101-3/+3
| | | | | | | | | | | | | | | (cherry picked from commit 1affcb80172576dc46e4434cd10e1a534a9bb6c2)
| * | | | Merge branch 'cherry-pick-6685381f' into 'dev'Mario2019-11-101618-435061/+122109
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | another bulk of composer updates See merge request hubzilla/core!1781
| | * | | | another bulk of composer updatesMario2019-11-101618-435061/+122109
| | |/ / / | | | | | | | | | | (cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
| * | | | Merge branch 'cherry-pick-9ad4c652' into 'dev'Mario2019-11-101-5/+8
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | hopefully fix query for postgres See merge request hubzilla/core!1780
| | * | | hopefully fix query for postgresMario2019-11-101-5/+8
| |/ / / | | | | | | | | (cherry picked from commit 9ad4c6528cc3ee4e34d2b5d77027a1c33cbadf5c)
| * | | Merge branch 'cherry-pick-971e7eef' into 'dev'Max Kostikov2019-11-1027-13265/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | remove some old unused javascript libraries See merge request hubzilla/core!1779
| | * | | Ãremove some old unused javascript librariesMario2019-11-1027-13265/+0
| | | |/ | | |/| | | | | (cherry picked from commit 971e7eef9c415a2ce82eb0cd22eaabee12ae719c)
| * | | Merge branch 'cherry-pick-b444bf59' into 'dev'Max Kostikov2019-11-101-4/+10597
| |\ \ \ | | |/ / | |/| | | | | | | | | | update jquery to version 3.4.1 See merge request hubzilla/core!1778
| | * | update jquery to version 3.4.1Mario2019-11-101-4/+10597
| |/ / | | | | | | (cherry picked from commit b444bf59560b3d918aa13b52035c602b03e8d013)
| * | Better BBcode to Markdown conversionMax Kostikov2019-11-081-2/+5
| | |
| * | Merge branch 'dev' into 'dev'M. Dent2019-11-082-7/+9
| |\ \ | | | | | | | | | | | | | | | | exempt svg from tag completion See merge request hubzilla/core!1777
| | * \ 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