Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mike Macgirvin | 2019-03-18 | 8 | -63/+42 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-03-15 | 1 | -2/+5 |
| |\ | | | | | | | | | | | | | email_header_encode() producing output that is not spec compliant See merge request hubzilla/core!1555 | ||||
| * | | Cleanup and fixes | Mario | 2019-03-15 | 8 | -63/+42 |
| | | | |||||
* | | | use php_eol for all mail header generation | zotlabs | 2019-03-16 | 1 | -2/+2 |
| | | | |||||
* | | | use the php_eol constant for encoded subjects | zotlabs | 2019-03-16 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-14 | 1 | -2/+5 |
|\ \ | |/ |/| | |||||
| * | email_header_encode() producing lines of illegal length because header field ↵ | zotlabs | 2019-03-14 | 1 | -2/+5 |
| | | | | | | | | length was not considered in length calculation. | ||||
* | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-13 | 1 | -2/+2 |
|\| | |||||
| * | signature issue for zot6 content imported from zotfeeds to hubzilla | zotlabs | 2019-03-13 | 1 | -2/+2 |
| | | |||||
* | | find unregistered z6 clones on hubzilla sites (does not happen automatically ↵ | zotlabs | 2019-03-13 | 1 | -0/+36 |
|/ | | | | since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release. | ||||
* | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | Mike Macgirvin | 2019-03-13 | 2 | -59/+190 |
|\ | |||||
| * | typos | zotlabs | 2019-03-12 | 1 | -8/+8 |
| | | |||||
| * | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-11 | 1 | -0/+9 |
| |\ | |||||
| | * | check zot6 in import_author_xchan | zotlabs | 2019-03-11 | 1 | -0/+9 |
| | | | |||||
| * | | security updates for multiple xchans | zotlabs | 2019-03-11 | 1 | -59/+189 |
| |/ | |||||
* / | perform zot6 discovery in import_author_xchan | Mike Macgirvin | 2019-03-12 | 1 | -0/+9 |
|/ | |||||
* | testing init_groups_visitor changes - also add virtual groups for both zot ↵ | zotlabs | 2019-03-10 | 1 | -13/+11 |
| | | | | identities | ||||
* | init_groups_visitor: include xchans from all zot-like networks | zotlabs | 2019-03-10 | 1 | -3/+21 |
| | |||||
* | authenticated fetch fixes | zotlabs | 2019-03-09 | 1 | -0/+48 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2019-03-07 | 1 | -0/+1 |
|\ | | | | | | | | | guest access tokens: xchan record not created on URL login See merge request hubzilla/core!1543 | ||||
| * | guest access tokens: xchan record not created on URL login | zotlabs | 2019-03-06 | 1 | -0/+1 |
| | | |||||
* | | Add CURLOPT_CONNECTTIMEOUT | M. Dent | 2019-03-06 | 1 | -0/+7 |
|/ | |||||
* | Use sender hash | DM42.Net (Matt Dent) | 2019-03-01 | 1 | -1/+1 |
| | |||||
* | use $channel_id until the function is adapted to not need it | Mario Vavti | 2019-02-26 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix-sync_an_item' into 'dev' | Mario | 2019-02-26 | 1 | -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 row | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -3/+3 |
| | | |||||
| * | Fixes - sync item based on item's user | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -4/+4 |
| | | |||||
| * | Fix misspelled variable | DM42.Net (Matt Dent) | 2019-02-23 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-02-25 | 3 | -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 import | zotlabs | 2019-02-24 | 3 | -5/+5 |
| | | |||||
| * | zot api changes to support combined content (items+files) import addon | zotlabs | 2019-02-24 | 2 | -19/+88 |
| | | |||||
* | | fix summary and use item_normal_search() for viewsrc so we can also view the ↵ | Mario Vavti | 2019-02-21 | 1 | -1/+6 |
|/ | | | | source for articles, cards, etc. | ||||
* | Fix: post_activity_item returns success => true even on failure. | M.Dent | 2019-02-18 | 1 | -0/+2 |
| | |||||
* | Refactor photo_driver to use namespaces. | Klaus Weidenbach | 2019-02-14 | 3 | -833/+12 |
| | | | | Add simple UnitTest, but it is not yet very meaningful. | ||||
* | Clean up and documentation in photo_drive. | Klaus Weidenbach | 2019-02-14 | 1 | -242/+271 |
| | |||||
* | affinity tool fixes | Mario Vavti | 2019-02-14 | 1 | -8/+0 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-02-07 | 2 | -6/+15 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-02-04 | 4 | -60/+108 |
| |\ | |||||
| * \ | Merge branch 'patch-20190201a' into 'dev' | Mario | 2019-02-02 | 1 | -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 editor | DM42.Net (Matt Dent) | 2019-02-01 | 1 | -5/+14 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | M. Dent | 2019-02-01 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Prevent Hubzilla usage for SEO backlinks See merge request hubzilla/core!1501 | ||||
| | * | | Prevent Hubzilla usage for SEO backlinks | Max Kostikov | 2019-02-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | add missing zot6 conversation completion (required for message repeats) | zotlabs | 2019-02-07 | 1 | -0/+19 |
| |_|/ |/| | | |||||
* | | | fix linkify_tags() so it works with xchans across multiple protocols, also ↵ | zotlabs | 2019-02-03 | 4 | -60/+108 |
|/ / | | | | | | | some fixes to activity parsing from upstream. | ||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-30 | 1 | -0/+12 |
|\ \ | |||||
| * | | cache embeds in the background on initial storage rather than on first access | zotlabs | 2019-01-29 | 1 | -0/+12 |
| | | | |||||
* | | | Extend documentation. | Klaus Weidenbach | 2019-01-28 | 1 | -24/+16 |
|/ / | |||||
* | | Correct and extend Doxygen comments. | Klaus Weidenbach | 2019-01-23 | 8 | -130/+205 |
| | | | | | | | | | | | | Correct some documentation errors for Doxygen and add more comments. Document some undefined variables with @FIXME. | ||||
* | | Merge branch 'prepare_text' into 'dev' | Mario | 2019-01-23 | 1 | -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 Weidenbach | 2019-01-22 | 1 | -27/+34 |
| | | | | | | | | | | | | Also extend documentation. |