aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | |
| * | | | | | starring and filing is only supported for post item typeMario2019-01-311-2/+2
| | |_|_|/ / | |/| | | |
* | | | | | disable repeat unless mid is a resolvable uri since this will do radically ↵zotlabs2019-02-072-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | different things on different network stacks (e.g. Diaspora) and it turns out there is no possible way to make Diaspora reshares compatible with ActivityPub or Zot6 repeat/announce/boost/whatever.
* | | | | | automatically redirect repeat to share for posts with unresolvable ↵zotlabs2019-02-071-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | message-ids (diaspora, hz < 4.0, etc.).
* | | | | | add missing zot6 conversation completion (required for message repeats)zotlabs2019-02-072-0/+197
| | | | | |
* | | | | | fix mid generation for shareszotlabs2019-02-071-2/+2
| |_|_|/ / |/| | | |
* | | | | fix verb for reshareszotlabs2019-02-061-1/+1
| | | | |
* | | | | more work on share/repeatzotlabs2019-02-061-1/+2
| | | | |
* | | | | work on repeat/share for Hubzillazotlabs2019-02-064-55/+110
| |_|/ / |/| | |
* | | | allow conversation completion for new comments to expired posts, regardless ↵zotlabs2019-02-051-12/+28
| |/ / |/| | | | | | | | | | | | | | of hyperdrive settings. Note that hyperdrive conversations may still be fetched from zap/osada servers but will be ignored.
* | | fix linkify_tags() so it works with xchans across multiple protocols, also ↵zotlabs2019-02-037-24/+27
|/ / | | | | | | some fixes to activity parsing from upstream.
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-301-0/+27
|\ \
| * | cache embeds in the background on initial storage rather than on first accesszotlabs2019-01-291-0/+27
| | |
* | | clean up whitespace and remove superfluous semicolonMario Vavti2019-01-291-18/+20
| | |
* | | Merge branch 'dev' into 'dev'Mario2019-01-291-15/+35
|\ \ \ | | | | | | | | | | | | | | | | Custom sessionhandler support, as requested See merge request hubzilla/core!1497
| * | | Custom sessionhandler support, as requestedMark Nowiasz2019-01-291-15/+35
| | | |
* | | | Revert "Make session handler pluggable"Mario2019-01-291-20/+9
| | | | | | | | | | | | This reverts commit 8972ca8134c16039c03ad83d26b75b9e9e21d7ea
* | | | Revert "fix wrong function name and coding style"Mario2019-01-291-1/+1
| | | | | | | | | | | | This reverts commit 456207b4e75ee4b28b60e90b44ef758dc95b2ebc
* | | | fix wrong function name and coding styleMario Vavti2019-01-291-1/+1
| | | |
* | | | Merge branch 'sessionhandlerhook' into 'dev'Mario2019-01-291-9/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make session handler pluggable See merge request hubzilla/core!1494