aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Merge branch 'dev' into 'dev'M. Dent2019-11-061-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | 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 uploadMario2019-11-042-7/+2
| | |/ / | |/| |
* | | | Merge branch 'cherry-pick-03317b98' into 'dev'M. Dent2019-11-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | fix query with protocol prefix not always picking the right xchanMario2019-11-041-1/+1
|/ / /
* | | Merge branch 'cherry-pick-4a1c2208' into 'dev'Max Kostikov2019-11-031-2/+3
|\ \ \
| * | | fix issue #1402Mario2019-11-031-2/+3
|/ / /
* | | Merge branch 'commentsclosed-hook' into 'dev'Mario2019-11-033-0/+33
|\ \ \
| * | | Add hook to comments_are_now_closed()M. Dent2019-11-033-0/+33
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-11-023-4/+2
|\| |
| * | Fix start time to sync queries on photo cache purgeMax Kostikov2019-11-021-1/+1