Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-01-23 | 1 | -0/+3 |
|\ \ \ | |/ / |/| / | |/ | | | Skip tags detection in URL See merge request hubzilla/core!1482 | ||||
| * | Skip tags detection in URL | Max Kostikov | 2019-01-22 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-01-21 | 2 | -50/+48 |
|\ \ | |||||
| * \ | Merge branch 'dev' into 'dev' | M. Dent | 2019-01-19 | 1 | -14/+12 |
| |\ \ | | | | | | | | | | | | | | | | | Some fixes in include/help.php. See merge request hubzilla/core!1479 | ||||
| | * | | Some fixes in include/help.php. | Klaus Weidenbach | 2019-01-18 | 1 | -14/+12 |
| | | | | | | | | | | | | | | | | Remove unused variables and a wrong function name. | ||||
| * | | | Fix wrong variable name in include/plugin.php. | Klaus Weidenbach | 2019-01-19 | 1 | -36/+36 |
| |/ / | |||||
* / / | this should fix the rest of the event stuff | zotlabs | 2019-01-17 | 1 | -4/+13 |
|/ / | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2019-01-16 | 8 | -154/+93 |
|\ \ | |||||
| * | | do not return if delivery report could not bedecrypted | Mario Vavti | 2019-01-16 | 1 | -17/+32 |
| | | | |||||
| * | | Merge branch 'patch-20190113a' into 'dev' | Mario | 2019-01-14 | 1 | -2/+17 |
| |\ \ | | | | | | | | | | | | | | | | | Add collect_public_recipients hook See merge request hubzilla/core!1467 | ||||
| | * | | Add collect_public_recipients hook | DM42.Net (Matt Dent) | 2019-01-12 | 1 | -2/+17 |
| | | | | |||||
| * | | | move order by and rewrite similar in update_queue_item() | DM42.Net (Matt Dent) | 2019-01-13 | 2 | -3/+3 |
| | | | | |||||
| * | | | outq_created not outq_scheduled | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | FIX: aggregated query error in MYSQL | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | FIX: memory exhaustion on zot message pickup with large message queue | M. Dent | 2019-01-12 | 1 | -2/+18 |
| |/ / | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-11 | 1 | -2/+3 |
| |\ \ | |||||
| * | | | we must sslify all possible content variables | Mario Vavti | 2019-01-10 | 1 | -1/+8 |
| | | | | |||||
| * | | | Update bbcode | Mario | 2019-01-07 | 1 | -14/+3 |
| | | | | |||||
| * | | | missing closing parenthesis | Mario Vavti | 2019-01-03 | 1 | -1/+1 |
| | | | |