aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* authenticated fetch fixeszotlabs2019-03-092-1/+5
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-081-12/+9
|\
| * $sender is supposed to be string in libzotMario2019-03-081-12/+9
| |
* | 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.
* fetch private objects using delivery channel credentialszotlabs2019-03-071-5/+28
|
* 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-043-33/+32
|\
| * 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)
| * 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.
| * fix summary and use item_normal_search() for viewsrc so we can also view the ↵Mario Vavti2019-02-211-1/+1
| | | | | | | | source for articles, cards, etc.
* | translate name of content filter (addon) app.zotlabs2019-02-281-0/+1
|/
* hubzilla has uuid - use that instead of wildcardzotlabs2019-02-191-4/+4
|
* remove extraneous loggingzotlabs2019-02-191-1/+0
|
* fix ability for file storage creators (visitors) to be able to delete their ↵zotlabs2019-02-192-14/+41
| | | | own content
* Merge branch 'dev' of https://framagit.org/zot/core into devzotlabs2019-02-191-3/+2
|\
| * if local_channel() and updating the page do not query for another item if ↵Mario Vavti2019-02-181-3/+2
| | | | | | | | the first query returned no results. we will most probably find an item from another channel (e.g. after liking a comment) and end up with multiple items with the same mid from different channels after the page update
* | mod_id should return object not collectionzotlabs2019-02-191-76/+9
| |
* | support zot location independent urlszotlabs2019-02-184-22/+320
|/
* Merge branch 'photo_driver_refactor' into 'dev'Mario2019-02-183-0/+874
|\ | | | | | | | | Photo driver refactor See merge request hubzilla/core!1515
| * Remove duplicate code in PhotoDriver classes.Klaus Weidenbach2019-02-143-38/+32
| | | | | | | | | | cropImage is just a special case of cropImageRect, no need to duplicate all the code.
| * Refactor photo_driver to use namespaces.Klaus Weidenbach2019-02-143-0/+880
| | | | | | | | Add simple UnitTest, but it is not yet very meaningful.
* | Merge branch 'dev' into 'dev'Mario2019-02-181-1/+1
|\ \ | | | | | | | | | | | | MySQL 8 admin summary compatibility See merge request hubzilla/core!1517
| * | MySQL 8 admin summary compatibilityMax Kostikov2019-02-171-1/+1
| | |
* | | Merge branch 'exclude_addon_common' into 'dev'M. Dent2019-02-151-1/+4
|\ \ \ | | | | | | | | | | | | | | | | exclude addon_common from addon list See merge request hubzilla/core!1513
| * | | exclude addon_common from addon listMario2019-02-151-1/+4
| | | |
* | | | deprecate addon settingsMario2019-02-151-7/+0
| |_|/ |/| |
* | | missing use appMario Vavti2019-02-141-0/+1
| | |
* | | Merge branch 'affinity_fixes' into 'dev'M. Dent2019-02-143-111/+93
|\ \ \ | | | | | | | | | | | | | | | | affinity tool fixes See merge request hubzilla/core!1511
| * | | affinity tool fixesMario Vavti2019-02-143-111/+93
| | | |
* | | | disable repeats until issues are resolvedMario Vavti2019-02-141-1/+2
|/ / /
* | | affinity slider as appphani002019-02-145-8/+85
| | |
* | | Only cascade privacy warning if thread parent has privacy concerns.M.Dent2019-02-131-5/+2
| | |
* | | Fix: only first lock red with privacy_warningM.Dent2019-02-121-3/+9
| | |
* | | Get all listenersM.Dent2019-02-111-2/+2
| | |
* | | use ACTIVITY_SHARE to match the verbMario Vavti2019-02-081-1/+1
| | |
* | | missing use AppMario Vavti2019-02-081-0/+1
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-02-073-7/+23
|\ \ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-075-56/+112
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-061-12/+28
| |\ \ \ \
| * \ \ \ \ Merge branch 'viewsrc_update' into 'dev'Max Kostikov2019-02-041-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | add the actual mid for debuging reasons See merge request hubzilla/core!1506
| | * | | | | add the actual mid for debuging reasonsMario Vavti2019-02-031-2/+2
| | | | | | |
| * | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-047-24/+27
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | cleanup logging and return if query returns empty resultMario Vavti2019-02-031-3/+6
| | | | | | |
| * | | | | | do not overwrite $sql_extraMario Vavti2019-02-031-2/+4
| | | | | | |
| * | | | | | Set lock red and provide warning if a forum is tagged in the postM. Dent2019-02-011-0/+11
| | | | | | |