| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | Merge branch 'video' into 'dev' | M. Dent | 2019-03-20 | 1 | -0/+22 |
| |\ \ | | | | | | | | | | | | | Video See merge request hubzilla/core!1561 | ||||
| | * | | Video | Mario | 2019-03-20 | 1 | -0/+22 |
| |/ / | |||||
| * | | Merge branch 'update_1231' into 'dev' | Max Kostikov | 2019-03-19 | 4 | -25/+89 |
| |\ \ | | | | | | | | | | | | | mysql: remove some unused indices and add thr_parent index. pgsql: sync... See merge request hubzilla/core!1560 | ||||
| | * | | mysql: remove some unused indices and add thr_parent index. pgsql: sync ↵ | Mario Vavti | 2019-03-19 | 4 | -25/+89 |
| |/ / | | | | | | | indices with mysql indices after testing on hub.disroot.org and add thr_parent | ||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-03-19 | 3 | -3/+25 |
| |\| | | | | | | | | | messagefilter enhancements and fix for advisory permissions edge case See merge request hubzilla/core!1559 | ||||
| | * | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | zotlabs | 2019-03-18 | 13 | -23/+192 |
| | |\ | |||||
| | | * | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into dev | Mike Macgirvin | 2019-03-19 | 2 | -3/+21 |
| | | |\ | |||||
| | | * \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mike Macgirvin | 2019-03-19 | 4 | -2/+171 |
| | | |\ \ | |_|/ / |/| | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | M. Dent | 2019-03-19 | 4 | -2/+171 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | composer: add phpmd and phpcs to require-dev See merge request hubzilla/core!1557 | ||||
| | * | | | | add phpmd and phpcs to require-dev | Mario | 2019-03-17 | 4 | -2/+171 |
| | | | | | | |||||
| | | | * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mike Macgirvin | 2019-03-19 | 9 | -21/+21 |
| | | | |\ \ | |_|_|/ / |/| | | | | |||||
| * | | | | | fix typos | Mario Vavti | 2019-03-18 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | some more xss prevention | Mario Vavti | 2019-03-18 | 5 | -16/+16 |
| | | | | | | |||||
| * | | | | | use urlencode | Mario Vavti | 2019-03-18 | 4 | -5/+5 |
| | | | | | | |||||
| * | | | | | ENT_COMPAT will only take care of double-quotes. Use double-quotes here to ↵ | Mario Vavti | 2019-03-18 | 4 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | prevent XSS | ||||
| * | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-03-18 | 9 | -19/+132 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | misc fixes See merge request hubzilla/core!1558 | ||||
| | * | | | | | clone systems apps to the extent possible, auto-configure imagick thumbnail ↵ | Zot | 2019-03-18 | 9 | -19/+132 |
| |/ / / / / | | | | | | | | | | | | | | | | binary during setup if possible | ||||
| | | * | / | share encoding issue between hz and zap | zotlabs | 2019-03-18 | 1 | -0/+4 |
| | | | |/ | | |/| | |||||
| | | * | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-18 | 2 | -3/+21 |
| | | |\ \ | | | |/ | | |/| | |||||
| | | | * | messagefilter enhancements, fix edge case in unsupported advisory privacy | zotlabs | 2019-03-18 | 2 | -3/+21 |
| | | | | | |||||
| | | * | | clone systems apps to the extent possible, auto-configure imagick thumbnail ↵ | zotlabs | 2019-03-17 | 4 | -1/+108 |
| | | |/ | | | | | | | | | | binary during setup if possible | ||||
| | | * | calling unserialize on array in util/service_class | zotlabs | 2019-03-17 | 1 | -1/+6 |
| | | | | |||||
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mike Macgirvin | 2019-03-18 | 13 | -83/+67 |
| | | |\ | |_|/ |/| | | |||||
| * | | | Merge branch 'dreport_fixes' into 'dev' | Max Kostikov | 2019-03-17 | 2 | -10/+13 |
| |\ \ \ | |/ / |/| | | | | | | | | fix dreport redeliver See merge request hubzilla/core!1556 | ||||
| | * | | fix dreport redeliver | Mario Vavti | 2019-03-15 | 2 | -10/+13 |
| |/ / | |||||
| * | | 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 '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 |
| |/ / / | |||||
| | | * | use php_eol for all mail header generation | zotlabs | 2019-03-16 | 2 | -14/+14 |
| | | | | |||||
| | | * | use the php_eol constant for encoded subjects | zotlabs | 2019-03-16 | 3 | -2/+3 |
| | |/ | |||||
| | * | 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' 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 |
| | | |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |