aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * issues uncovered testing combined item/file importzotlabs2019-02-243-5/+5
| |
| * zot api changes to support combined content (items+files) import addonzotlabs2019-02-242-19/+88
| |
* | fix summary and use item_normal_search() for viewsrc so we can also view the ↵Mario Vavti2019-02-211-1/+6
|/ | | | source for articles, cards, etc.
* Fix: post_activity_item returns success => true even on failure.M.Dent2019-02-181-0/+2
|
* Refactor photo_driver to use namespaces.Klaus Weidenbach2019-02-143-833/+12
| | | | Add simple UnitTest, but it is not yet very meaningful.
* Clean up and documentation in photo_drive.Klaus Weidenbach2019-02-141-242/+271
|
* affinity tool fixesMario Vavti2019-02-141-8/+0
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-02-072-6/+15
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2019-02-044-60/+108
| |\
| * \ Merge branch 'patch-20190201a' into 'dev'Mario2019-02-021-5/+14
| |\ \ | | | | | | | | | | | | | | | | Add filter hooks and the ability to add buttons to the default status editor See merge request hubzilla/core!1502
| | * | Add filter hooks and the ability to add buttons to the default status editorDM42.Net (Matt Dent)2019-02-011-5/+14
| | | |
| * | | Merge branch 'dev' into 'dev'M. Dent2019-02-011-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | Prevent Hubzilla usage for SEO backlinks See merge request hubzilla/core!1501
| | * | Prevent Hubzilla usage for SEO backlinksMax Kostikov2019-02-011-1/+1
| | | |
* | | | add missing zot6 conversation completion (required for message repeats)zotlabs2019-02-071-0/+19
| |_|/ |/| |
* | | fix linkify_tags() so it works with xchans across multiple protocols, also ↵zotlabs2019-02-034-60/+108
|/ / | | | | | | some fixes to activity parsing from upstream.
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-301-0/+12
|\ \
| * | cache embeds in the background on initial storage rather than on first accesszotlabs2019-01-291-0/+12
| | |
* | | Extend documentation.Klaus Weidenbach2019-01-281-24/+16
|/ /
* | Correct and extend Doxygen comments.Klaus Weidenbach2019-01-238-130/+205
| | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME.
* | Merge branch 'prepare_text' into 'dev'Mario2019-01-231-27/+34
|\ \ | | | | | | | | | | | | Correct parameter in include/text.php prepare_text() See merge request hubzilla/core!1483
| * | Correct parameter in include/text.php prepare_text()Klaus Weidenbach2019-01-221-27/+34
| | | | | | | | | | | | Also extend documentation.
* | | Merge branch 'dev' into 'dev'Mario2019-01-231-0/+3
|\ \ \ | |/ / |/| / | |/ | | Skip tags detection in URL See merge request hubzilla/core!1482
| * Skip tags detection in URLMax Kostikov2019-01-221-0/+3
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-01-212-50/+48
|\ \
| * \ Merge branch 'dev' into 'dev'M. Dent2019-01-191-14/+12
| |\ \ | | | | | | | | | | | | | | | | Some fixes in include/help.php. See merge request hubzilla/core!1479
| | * | Some fixes in include/help.php.Klaus Weidenbach2019-01-181-14/+12
| | | | | | | | | | | | | | | | Remove unused variables and a wrong function name.
| * | | Fix wrong variable name in include/plugin.php.Klaus Weidenbach2019-01-191-36/+36
| |/ /
* / / this should fix the rest of the event stuffzotlabs2019-01-171-4/+13
|/ /
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2019-01-168-154/+93
|\ \
| * | do not return if delivery report could not bedecryptedMario Vavti2019-01-161-17/+32
| | |
| * | Merge branch 'patch-20190113a' into 'dev'Mario2019-01-141-2/+17
| |\ \ | | | | | | | | | | | | | | | | Add collect_public_recipients hook See merge request hubzilla/core!1467
| | * | Add collect_public_recipients hookDM42.Net (Matt Dent)2019-01-121-2/+17
| | | |
| * | | move order by and rewrite similar in update_queue_item()DM42.Net (Matt Dent)2019-01-132-3/+3
| | | |
| * | | outq_created not outq_scheduledDM42.Net (Matt Dent)2019-01-131-1/+1
| | | |
| * | | FIX: aggregated query error in MYSQLDM42.Net (Matt Dent)2019-01-131-1/+1
| | | |
| * | | FIX: memory exhaustion on zot message pickup with large message queueM. Dent2019-01-121-2/+18
| |/ /
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-111-2/+3
| |\ \
| * | | we must sslify all possible content variablesMario Vavti2019-01-101-1/+8
| | | |
| * | | Update bbcodeMario2019-01-071-14/+3
| | | |
| * | | missing closing parenthesisMario Vavti2019-01-031-1/+1
| | | |
| * | | fix content type checkMario Vavti2019-01-031-5/+8
| | | |
| * | | Revert "Merge branch 'check_content_type' into 'dev'"Max Kostikov2019-01-031-7/+4
| | | | | | | | | | | | This reverts merge request !1453
| * | | Merge branch 'check_content_type' into 'dev'Max Kostikov2019-01-031-4/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | check suppported type if we get content type from header See merge request hubzilla/core!1453
| | * | | check suppported type if we get content type from headerMario Vavti2019-01-021-4/+7
| | | |/ | | |/|
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2019-01-021-3/+3
| |\ \ \ | | |/ / | |/| |
| * | | Fix for cURL with default HTTP/2Max Kostikov2018-12-201-13/+4
| | | |
| * | | Revert "Fix cURL with HTTP/2"Max Kostikov2018-12-201-4/+13
| | | | | | | | | | | | This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065
| * | | Fix cURL with HTTP/2Max Kostikov2018-12-201-13/+4
| | | |
| * | | Merge branch 'dark-fix-dev' into 'dev'Mario2018-12-191-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css See merge request hubzilla/core!1442
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 00:00:08 +0000