Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'core_fixes_1' into 'dev' | M. Dent | 2019-03-08 | 1 | -12/+9 | |
|\ \ | | | | | | | | | | | | | $sender is supposed to be string in libzot See merge request hubzilla/core!1544 | |||||
| * | | $sender is supposed to be string in libzot | Mario | 2019-03-08 | 1 | -12/+9 | |
|/ / | ||||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2019-03-08 | 1 | -5/+28 | |
|\ \ | | | | | | | | | | | | | fetch private objects using delivery channel credentials See merge request hubzilla/core!1545 | |||||
| | * | port zot_record_preferred | zotlabs | 2019-03-08 | 1 | -2/+22 | |
| | | | ||||||
| | * | It is in fact the 'Content Import' app string that needs to be translated. A ↵ | zotlabs | 2019-03-07 | 1 | -0/+1 | |
| | | | | | | | | | | | | previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla. | |||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-07 | 2 | -0/+112 | |
| |/| | |/ |/| | ||||||
* | | update changelog | Mario Vavti | 2019-03-07 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-03-07 | 1 | -0/+1 | |
|\ \ | | | | | | | | | | | | | guest access tokens: xchan record not created on URL login See merge request hubzilla/core!1543 | |||||
* | | | changelog | Mario Vavti | 2019-03-06 | 1 | -0/+104 | |
| | | | ||||||
* | | | Merge branch 'patch-20190305a' into 'dev' | Mario | 2019-03-06 | 1 | -0/+7 | |
|\ \ \ | | | | | | | | | | | | | | | | | Add CURLOPT_CONNECTTIMEOUT See merge request hubzilla/core!1542 | |||||
| * | | | Add CURLOPT_CONNECTTIMEOUT | M. Dent | 2019-03-06 | 1 | -0/+7 | |
|/ / / | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-06 | 1 | -0/+18 | |
|\ \ \ | | | | | | | | | | | | | | | | | sync recent z6 protocol change See merge request hubzilla/core!1541 | |||||
* \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-03-05 | 4 | -2/+17 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | assorted minor fixes from downstream See merge request hubzilla/core!1540 | |||||
| | | | * | fetch private objects using delivery channel credentials | zotlabs | 2019-03-07 | 1 | -5/+28 | |
| | | |/ | ||||||
| | | * | guest access tokens: xchan record not created on URL login | zotlabs | 2019-03-06 | 1 | -0/+1 | |
| | |/ | ||||||
| | * | channel_type is not integer | zotlabs | 2019-03-05 | 1 | -5/+17 | |
| | | | ||||||
| | * | maintain compatibility with recent zot6 changes | zotlabs | 2019-03-05 | 1 | -0/+6 | |
| |/ | ||||||
| * | api_router - allow parameters as final path argument | zotlabs | 2019-03-04 | 1 | -1/+9 | |
| | | ||||||
| * | remove clones from delivery recipients for top-level posts - they will get ↵ | zotlabs | 2019-03-04 | 1 | -0/+6 | |
| | | | | | | | | the post via clone sync | |||||
| * | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵ | zotlabs | 2019-03-04 | 1 | -1/+1 | |
| | | | | | | | | and is throwing php warnings when trying to decode | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-04 | 16 | -15761/+16056 | |
| |\ | |/ |/| | ||||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-03-04 | 1 | -2/+2 | |
|\ \ | | | | | | | | | | | | | Addressing new 'support@zotadel.net' support forum instead of old 'support@gravizot.de' See merge request hubzilla/core!1539 | |||||
| * | | Addressing new 'support@zotadel.net' support forum instead of old ↵ | mike | 2019-03-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | 'support@gravizot.de' | |||||
* | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-03-03 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is... See merge request hubzilla/core!1538 | |||||
| * | | | while in legacy zot $sender is expected to be an array, in zot6 $sender is ↵ | Mario Vavti | 2019-03-02 | 1 | -1/+1 | |
|/ / / | | | | | | | | | | expected to be a string (xchan_hash) | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-02 | 1 | -1/+1 | |
|\| | | | | | | | | | | | | | | Mention php-zip module dependency in administrator guide See merge request hubzilla/core!1537 | |||||
| * | | Mention php-zip module dependency in administrator guide | mike | 2019-03-02 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'patch-20190301a' into 'dev' | Mario | 2019-03-02 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | | | | | | | Use sender hash See merge request hubzilla/core!1535 | |||||
| * | | Use sender hash | DM42.Net (Matt Dent) | 2019-03-01 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-03-01 | 1 | -5/+11 | |
|\ \ \ | |/ / |/| | | | | | | | | iron out some kinks with scrollToItem() in combination with collapsed content and images See merge request hubzilla/core!1534 | |||||
| * | | iron out some kinks with scrollToItem() in combination with collapsed ↵ | Mario Vavti | 2019-03-01 | 1 | -5/+11 | |
|/ / | | | | | | | content and images | |||||
* | | use $channel_id until the function is adapted to not need it | Mario Vavti | 2019-02-26 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'fix-sync_an_item' into 'dev' | Mario | 2019-02-26 | 1 | -1/+1 | |
|\ \ | | | | | | | | | | | | | Fix sync an item See merge request hubzilla/core!1531 | |||||
| * | | xchan_query and fetch_post_tags uses full query results not a single row | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -3/+3 | |
| | | | ||||||
| * | | Fixes - sync item based on item's user | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -4/+4 | |
| | | | ||||||
| * | | Fix misspelled variable | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-02-25 | 3 | -19/+88 | |
|\ \ \ | | | | | | | | | | | | | | | | | zot api changes to support combined content (items+files) import addon See merge request hubzilla/core!1533 | |||||
* \ \ \ | Merge branch 'js_fixes' into 'dev' | M. Dent | 2019-02-24 | 3 | -10/+18 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where... See merge request hubzilla/core!1532 | |||||
| * | | | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where ↵ | Mario Vavti | 2019-02-23 | 3 | -10/+18 | |
|/ / / | | | | | | | | | | selecting multiple images from embed photos dialog broke and fix issue where items were not scrolled to there correct position if justifiedGalleryActive flag was true | |||||
* | | | Merge branch 'php' into 'dev' | Mario | 2019-02-22 | 1 | -31/+30 | |
|\ \ \ | | | | | | | | | | | | | | | | | Update PHP Version check during Setup. See merge request hubzilla/core!1530 | |||||
| * | | | Update PHP Version check during Setup. | Klaus Weidenbach | 2019-02-21 | 1 | -31/+30 | |
| | | | | | | | | | | | | | | | | | | | | Hubzilla 4.0 requires PHP7. The oldest still supported PHP branch is 7.1. So check during Setup for PHP >= 7.1. | |||||
* | | | | Merge branch 'es-es' into 'dev' | Max Kostikov | 2019-02-22 | 0 | -0/+0 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Quickfix es-es/hstrings.php See merge request hubzilla/core!1529 | |||||
| * | | | Merge branch 'cherry-pick-f92d2e3f' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Quickfix es-es/hstrings.php See merge request mjfriaza/core!6 | |||||
| | * | | | Quickfix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | (cherry picked from commit f92d2e3f7c6573bd7bab04223c7e28662605c6d8) | |||||
| * | | | Merge branch 'cherry-pick-a9b75d05' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Fix es-es/hstrings.php See merge request mjfriaza/core!5 | |||||
| | * | | | Fix es-es/hstrings.php | Manuel Jiménez Friaza | 2019-02-21 | 1 | -1/+1 | |
| |/ / / | | | | | | | | | (cherry picked from commit a9b75d059b2a54f1b87657d95f9ac1124ed4287d) | |||||
* | | | | Merge branch 'es-es' into 'dev' | Mario | 2019-02-21 | 2 | -1644/+1992 | |
|\| | | | | | | | | | | | | | | | | | | | Update es-es See merge request hubzilla/core!1526 | |||||
| * | | | Merge branch 'cherry-pick-e6f289de' into 'es-es' | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1644/+1992 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Update Spanish translation See merge request mjfriaza/core!4 | |||||
| | * | | | Update Spanish translation | Manuel Jiménez Friaza | 2019-02-21 | 2 | -1644/+1992 | |
| |/ / / | | | | | | | | | (cherry picked from commit e6f289deb65e7c770641b27bbe0e48d056a6cd76) | |||||
* | | | | Merge branch 'core_fixes' into 'dev' | M. Dent | 2019-02-21 | 2 | -2/+7 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix summary and use item_normal_search() for viewsrc so we can also view the... See merge request hubzilla/core!1525 |