aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* onepoll: do not update dead feedsMario2019-11-152-5/+11
* make inline pdf a security option, move thumbnail security to security option...Mario2019-11-155-8/+15
* AP fixesMario2019-11-151-1/+7
* check if file existsMario2019-11-131-1/+1
* wildcard tag issuezotlabs2019-11-131-0/+3
* use minified version of jqueryMario2019-11-111-10598/+2
* 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 testsMario2019-11-101-3/+3
* | Merge branch 'cherry-pick-6685381f' into 'dev'Mario2019-11-101618-435061/+122109
|\ \
| * | another bulk of composer updatesMario2019-11-101618-435061/+122109
| |/
* | Merge branch 'cherry-pick-9ad4c652' into 'dev'Mario2019-11-101-5/+8
|\ \ | |/ |/|
| * hopefully fix query for postgresMario2019-11-101-5/+8
|/
* Merge branch 'cherry-pick-971e7eef' into 'dev'Max Kostikov2019-11-1027-13265/+0
|\
| * Ãremove some old unused javascript librariesMario2019-11-1027-13265/+0
* | Merge branch 'cherry-pick-b444bf59' into 'dev'Max Kostikov2019-11-101-4/+10597
|\ \ | |/ |/|
| * update jquery to version 3.4.1Mario2019-11-101-4/+10597
|/
* Better BBcode to Markdown conversionMax Kostikov2019-11-081-2/+5
* Merge branch 'dev' into 'dev'M. Dent2019-11-082-7/+9
|\
| * 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 formatMario2019-11-081-1/+1
|/ /
* | Merge branch 'cherry-pick-bb11cd15' into 'dev'Max Kostikov2019-11-081-1/+1
|\ \
| * | fix date header formatMario2019-11-081-1/+1
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2019-11-081-1/+1
|\ \
| * | 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 composr libsMario2019-11-0828-71/+159
|/ / /
* | | Merge branch 'dev' into 'dev'Mario2019-11-084-1/+209
|\ \ \
| * | | 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 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 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 arraysMario2019-11-041-6/+11
* | | | Merge branch 'cherry-pick-3604220c' into 'dev'M. Dent2019-11-061-2/+2
|\ \ \ \
| * | | | add date and request target headers to make pixelfed happyMario2019-11-041-2/+2
| |/ / /