aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * 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 addonsroot2019-11-011-2/+2
| |/ /
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-11-011-10/+6
| |\|
| | * 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
| |\|
| | * Update Photo.phpMax Kostikov2019-10-261-1/+1
| | * Better cached photos processingMax Kostikov2019-10-261-13/+5
| * | fix hardcoded code/pre css in mod adminMario2019-10-221-18/+0
| * | fix encoding issueMario2019-10-221-1/+1
| * | Merge branch 'patch-1' into 'dev'Max Kostikov2019-10-193-0/+14886
| |\ \
| | * | Update view/ja/hstrings.phpharukin2019-10-191-1/+1
| | * | Update view/ja/hmessages.po, view/ja/hstrings.php filesharukin2019-10-172-2/+8
| | * | Upload .php fileharukin2019-10-141-0/+2791
| | * | Upload .po fileharukin2019-10-141-0/+12089
| | * | japanese translation directoryharukin2019-10-141-0/+0
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Fix channel address in follow linkMax Kostikov2019-10-151-1/+1
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-10-151-3/+7
| |\| |