Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2019-04-10 | 1 | -4/+12 |
|\ | | | | | | | | | Dev See merge request hubzilla/core!1586 | ||||
| * | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | zotlabs | 2019-04-07 | 1 | -8/+0 |
| |\ | |||||
| * | | permissions cleanup | zotlabs | 2019-04-05 | 1 | -4/+12 |
| | | | |||||
* | | | Revert "Update htconfig.sample.php" | Max Kostikov | 2019-04-10 | 2 | -5/+15 |
| |/ |/| | | | | | This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12 | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-04-06 | 1 | -3/+3 |
|\| | | | | | | | | | security: perms_pending not evaluated correctly See merge request hubzilla/core!1583 | ||||
| * | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-05 | 1 | -3/+3 |
| |\ | |||||
| | * | security: perms_pending not evaluated correctly | zotlabs | 2019-04-05 | 1 | -3/+3 |
| | | | |||||
* | | | Remove suggest channels from features | Mario | 2019-04-02 | 1 | -8/+0 |
|/ / | |||||
* | | check service class limits when syncing files | zotlabs | 2019-03-30 | 1 | -0/+14 |
| | | |||||
* | | Merge branch 'z6_discover_fixes' into 'dev' | Max Kostikov | 2019-03-29 | 1 | -4/+6 |
|\ \ | | | | | | | | | | | | | fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575 | ||||
| * | | another fix for z6_discover() and create a zot6 hubloc if applicable | Mario Vavti | 2019-03-28 | 1 | -1/+1 |
| | | | |||||
| * | | fix various issues in z6_discover() | Mario Vavti | 2019-03-27 | 1 | -3/+5 |
| | | | |||||
* | | | Fix wrong bracket | Max Kostikov | 2019-03-27 | 1 | -2/+2 |
| | | | |||||
* | | | Fix wrong permissions on attached images in personal messages | Max Kostikov | 2019-03-27 | 1 | -2/+2 |
|/ / | |||||
* | | if we have an uuid deduplicate by uuid otherwise by mid | Mario Vavti | 2019-03-25 | 1 | -5/+15 |
| | | |||||
* | | fix wrong field name | Mario Vavti | 2019-03-24 | 1 | -2/+2 |
| | | |||||
* | | Revert "item_store(): deduplicate by mid OR uuid" | Mario Vavti | 2019-03-24 | 1 | -2/+1 |
| | | | | | | | | This reverts commit d8ce0d0df0b7b58b3f2a1abfc26f455fb943f8ea. | ||||
* | | item_store(): deduplicate by mid OR uuid | Mario Vavti | 2019-03-24 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-03-21 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | hubzilla core issue #1356 , permissions not getting decrypted on follow See merge request hubzilla/core!1563 | ||||
| * | | hubzilla core issue #1356 , permissions not getting decrypted on follow | zotlabs | 2019-03-20 | 1 | -0/+1 |
| |/ | |||||
* | | another whitespace to trigger tests | Mario Vavti | 2019-03-21 | 1 | -1/+0 |
| | | |||||
* | | just whitespace to trigger a new build test | Mario Vavti | 2019-03-20 | 1 | -1/+0 |
| | | |||||
* | | Video | Mario | 2019-03-20 | 1 | -0/+22 |
|/ | |||||
* | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-18 | 1 | -2/+6 |
|\ | |||||
| * | messagefilter enhancements, fix edge case in unsupported advisory privacy | zotlabs | 2019-03-18 | 1 | -2/+6 |
| | | |||||
* | | clone systems apps to the extent possible, auto-configure imagick thumbnail ↵ | zotlabs | 2019-03-17 | 2 | -1/+99 |
|/ | | | | binary during setup if possible | ||||
* | 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 |
| |