aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* testing init_groups_visitor changes - also add virtual groups for both zot ↵zotlabs2019-03-101-13/+11
| | | | identities
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-100-0/+0
|\
| * Merge branch 'dev' into 'dev'Mario2019-03-105-3/+76
| |\ | | | | | | | | | | | | non-critical: port zot_record_preferred() See merge request hubzilla/core!1546
* | | init_groups_visitor: include xchans from all zot-like networkszotlabs2019-03-101-3/+21
| |/ |/|
* | authenticated fetch fixeszotlabs2019-03-093-1/+53
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-082-13/+10
|\|
| * update changelogMario Vavti2019-03-081-1/+1
| | | | | | (cherry picked from commit 5b3824917d591b27c4797971c8253ed67b41dc5a)
| * Merge branch 'core_fixes_1' into 'dev'M. Dent2019-03-081-12/+9
| |\ | | | | | | | | | | | | $sender is supposed to be string in libzot See merge request hubzilla/core!1544
| | * $sender is supposed to be string in libzotMario2019-03-081-12/+9
| |/
| * Merge branch 'dev' into 'dev'M. Dent2019-03-081-5/+28
| |\ | | | | | | | | | | | | fetch private objects using delivery channel credentials See merge request hubzilla/core!1545
* | | port zot_record_preferredzotlabs2019-03-081-2/+22
| | |
* | | It is in fact the 'Content Import' app string that needs to be translated. A ↵zotlabs2019-03-071-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 devzotlabs2019-03-072-0/+112
|\| | | |/ |/|
| * update changelogMario Vavti2019-03-071-0/+1
| |
| * Merge branch 'dev' into 'dev'Mario2019-03-071-0/+1
| |\ | | | | | | | | | | | | guest access tokens: xchan record not created on URL login See merge request hubzilla/core!1543
| * | changelogMario Vavti2019-03-061-0/+104
| | |
| * | Merge branch 'patch-20190305a' into 'dev'Mario2019-03-061-0/+7
| |\ \ | | | | | | | | | | | | | | | | Add CURLOPT_CONNECTTIMEOUT See merge request hubzilla/core!1542
| | * | Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
| |/ /
| * | Merge branch 'dev' into 'dev'Mario2019-03-061-0/+18
| |\ \ | | | | | | | | | | | | | | | | sync recent z6 protocol change See merge request hubzilla/core!1541
| * \ \ Merge branch 'dev' into 'dev'Mario2019-03-054-2/+17
| |\ \ \ | | | | | | | | | | | | | | | | | | | | assorted minor fixes from downstream See merge request hubzilla/core!1540
* | | | | fetch private objects using delivery channel credentialszotlabs2019-03-071-5/+28
| |_|_|/ |/| | |
* | | | guest access tokens: xchan record not created on URL loginzotlabs2019-03-061-0/+1
| |_|/ |/| |
* | | channel_type is not integerzotlabs2019-03-051-5/+17
| | |
* | | maintain compatibility with recent zot6 changeszotlabs2019-03-051-0/+6
| |/ |/|
* | api_router - allow parameters as final path argumentzotlabs2019-03-041-1/+9
| |
* | remove clones from delivery recipients for top-level posts - they will get ↵zotlabs2019-03-041-0/+6
| | | | | | | | the post via clone sync
* | mod_oep: photos/album/xxxxx is no longer hex2bin/bin2hex but the album hash ↵zotlabs2019-03-041-1/+1
| | | | | | | | and is throwing php warnings when trying to decode
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-0416-15761/+16056
|\|
| * Merge branch 'dev' into 'dev'Mario2019-03-041-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 ↵mike2019-03-031-2/+2
| | | | | | | | | | | | 'support@gravizot.de'
| * | Merge branch 'core_fixes' into 'dev'M. Dent2019-03-031-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 Vavti2019-03-021-1/+1
| |/ / | | | | | | | | | expected to be a string (xchan_hash)
| * | Merge branch 'dev' into 'dev'Mario2019-03-021-1/+1
| |\| | | | | | | | | | | | | Mention php-zip module dependency in administrator guide See merge request hubzilla/core!1537
| | * Mention php-zip module dependency in administrator guidemike2019-03-021-1/+1
| | |
| * | Merge branch 'patch-20190301a' into 'dev'Mario2019-03-021-1/+1
| |\ \ | | |/ | |/| | | | | | | Use sender hash See merge request hubzilla/core!1535
| | * Use sender hashDM42.Net (Matt Dent)2019-03-011-1/+1
| | |
| * | Merge branch 'js_fixes' into 'dev'M. Dent2019-03-011-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 Vavti2019-03-011-5/+11
| |/ | | | | | | content and images
| * use $channel_id until the function is adapted to not need itMario Vavti2019-02-261-1/+1
| |
| * Merge branch 'fix-sync_an_item' into 'dev'Mario2019-02-261-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 rowDM42.Net (Matt Dent)2019-02-231-3/+3
| | |
| | * Fixes - sync item based on item's userDM42.Net (Matt Dent)2019-02-231-4/+4
| | |
| | * Fix misspelled variableDM42.Net (Matt Dent)2019-02-231-1/+1
| | |
| * | Merge branch 'dev' into 'dev'Mario2019-02-253-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. Dent2019-02-243-10/+18
| |\ \ \ | | |_|/ | |/| | | | | | | | | | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where... See merge request hubzilla/core!1532
| | * | fix regression from commit 04ec35d9cc39cbf62c8db2818574c1f6d56f2a20 where ↵Mario Vavti2019-02-233-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'Mario2019-02-221-31/+30
| |\ \ | | | | | | | | | | | | | | | | Update PHP Version check during Setup. See merge request hubzilla/core!1530
| | * | Update PHP Version check during Setup.Klaus Weidenbach2019-02-211-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 Kostikov2019-02-220-0/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | Quickfix es-es/hstrings.php See merge request hubzilla/core!1529
| | * | Merge branch 'cherry-pick-f92d2e3f' into 'es-es'Manuel Jiménez Friaza2019-02-211-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Quickfix es-es/hstrings.php See merge request mjfriaza/core!6
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 07:34:26 +0000