aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* merge text.php and hmessages.po4.0Mario Vavti2019-03-081-22/+0
|
* Merge branch '4.0RC'Mario Vavti2019-03-0827-1448/+1214
|\
| * guest access tokens: xchan record not created on URL loginzotlabs2019-03-071-0/+1
| | | | | | (cherry picked from commit 0b2213dd41a7ef275766725c070e16f8ba94d5a5)
| * Add CURLOPT_CONNECTTIMEOUTM. Dent2019-03-061-0/+7
| | | | | | (cherry picked from commit 0c05e6593e020180ca678dff6d60c095e23b34cd)
| * Use sender hashDM42.Net (Matt Dent)2019-03-021-1/+1
| | | | | | (cherry picked from commit 5febc3e07dd1c1aeda68c09b4092d5d4219f39b5)
| * 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
| | * 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 08:16:29 +0000