| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 | ||||
| | * | 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 'cleanup' into 'dev' | M. Dent | 2019-03-15 | 11 | -74/+55 |
| |\ \ \ | |/ / |/| | | | | | | | | Cleanup and fixes See merge request hubzilla/core!1554 | ||||
| | * | | Cleanup and fixes | Mario | 2019-03-15 | 11 | -74/+55 |
| |/ / | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-14 | 4 | -2/+40 |
| |\ \ | | | | | | | | | | | | | two compatibility issues zot/zot6 See merge request hubzilla/core!1553 | ||||
| | * \ | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | Mike Macgirvin | 2019-03-14 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | 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 |
| | | | | | |||||
| | * | | | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | Mike Macgirvin | 2019-03-14 | 3 | -0/+38 |
| | |\| | | |||||
| | | * | | find unregistered z6 clones on hubzilla sites (does not happen automatically ↵ | zotlabs | 2019-03-13 | 3 | -0/+38 |
| | | |/ | | | | | | | | | | since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release. | ||||
| * | | | Merge branch 'core_fixes_2' into 'dev' | M. Dent | 2019-03-13 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | add zot6 to clonable networks See merge request hubzilla/core!1552 | ||||
| | * | | | add zot6 to clonable networks | Mario Vavti | 2019-03-13 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-13 | 3 | -88/+239 |
| |\| | | | | | | | | | | | | | | Dev See merge request hubzilla/core!1551 | ||||
| | * | | limit 1 | Mike Macgirvin | 2019-03-13 | 1 | -1/+1 |
| | |/ | |||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mike Macgirvin | 2019-03-13 | 0 | -0/+0 |
| | |\ | |/ |/| | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-12 | 1 | -0/+9 |
| |\ \ | | | | | | | | | | | | | perform zot6 discovery in import_author_xchan See merge request hubzilla/core!1550 | ||||
| * \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-03-11 | 1 | -7/+23 |
| |\ \ \ | | | | | | | | | | | | | | | | | init_groups_visitor: include xchans from all zot-like networks See merge request hubzilla/core!1549 | ||||
| | | | * | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | Mike Macgirvin | 2019-03-13 | 3 | -88/+239 |
| | | |/| | |||||
| | | | * | rework authenticated item fetches (check ACL on the parent, not on the ↵ | zotlabs | 2019-03-12 | 1 | -56/+41 |
| | | | | | | | | | | | | | | | | | requested item) | ||||
| | | | * | add owner permission checks to AS item fetch | zotlabs | 2019-03-12 | 1 | -2/+37 |
| | | | | | |||||
| | | | * | 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 | ||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-10 | 0 | -0/+0 |
| | |\ | |/ |/| | |||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-10 | 5 | -3/+76 |
| |\ \ | | | | | | | | | | | | | non-critical: port zot_record_preferred() See merge request hubzilla/core!1546 | ||||
| | | * | init_groups_visitor: include xchans from all zot-like networks | zotlabs | 2019-03-10 | 1 | -3/+21 |
| | |/ | |||||
| | * | authenticated fetch fixes | zotlabs | 2019-03-09 | 3 | -1/+53 |
| | | | |||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-08 | 2 | -13/+10 |
| | |\ | |/ |/| | |||||
| * | | update changelog | Mario Vavti | 2019-03-08 | 1 | -1/+1 |
| | | | | | | | (cherry picked from commit 5b3824917d591b27c4797971c8253ed67b41dc5a) | ||||
| * | | Merge branch 'core_fixes_1' into 'dev' | M. Dent | 2019-03-08 | 1 | -12/+9 |
| |\ \ | | | | | | | | | | | | | $sender is supposed to be string in libzot See merge request hubzilla/core!1544 | ||||
| | * | | $sender is supposed to be string in libzot | Mario | 2019-03-08 | 1 | -12/+9 |
| |/ / | |||||
| * | | Merge branch 'dev' into 'dev' | M. Dent | 2019-03-08 | 1 | -5/+28 |
| |\ \ | | | | | | | | | | | | | fetch private objects using delivery channel credentials See merge request hubzilla/core!1545 | ||||
| | | * | port zot_record_preferred | zotlabs | 2019-03-08 | 1 | -2/+22 |
| | | | | |||||
| | | * | It is in fact the 'Content Import' app string that needs to be translated. A ↵ | zotlabs | 2019-03-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | previous commit errantly included the string 'Content Filter'. But don't remove 'Content Filter'. That is actually a thing in Zap and will eventually make its way to Hubzilla. | ||||
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-03-07 | 2 | -0/+112 |
| | |/| | |/ |/| | |||||
| * | | update changelog | Mario Vavti | 2019-03-07 | 1 | -0/+1 |
| | | | |||||
| * | | 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 | ||||
| * | | | changelog | Mario Vavti | 2019-03-06 | 1 | -0/+104 |
| | | | | |||||
| * | | | Merge branch 'patch-20190305a' into 'dev' | Mario | 2019-03-06 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | | | | | | | | | Add CURLOPT_CONNECTTIMEOUT See merge request hubzilla/core!1542 | ||||
| | * | | | Add CURLOPT_CONNECTTIMEOUT | M. Dent | 2019-03-06 | 1 | -0/+7 |
| |/ / / | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-06 | 1 | -0/+18 |
| |\ \ \ | | | | | | | | | | | | | | | | | sync recent z6 protocol change See merge request hubzilla/core!1541 | ||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Mario | 2019-03-05 | 4 | -2/+17 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | assorted minor fixes from downstream See merge request hubzilla/core!1540 | ||||
| | | | | * | fetch private objects using delivery channel credentials | zotlabs | 2019-03-07 | 1 | -5/+28 |
| | | | |/ | |||||
| | | | * | guest access tokens: xchan record not created on URL login | zotlabs | 2019-03-06 | 1 | -0/+1 |
| | | |/ | |||||
| | | * | channel_type is not integer | zotlabs | 2019-03-05 | 1 | -5/+17 |
| | | | | |||||
| | | * | maintain compatibility with recent zot6 changes | zotlabs | 2019-03-05 | 1 | -0/+6 |
| | |/ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |