aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | fix dreport redeliverMario Vavti2019-03-152-10/+13
| |/ / /
| * | | Merge branch 'dev' into 'dev'Mario2019-03-151-2/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | email_header_encode() producing output that is not spec compliant See merge request hubzilla/core!1555
| * \ \ \ Merge branch 'cleanup' into 'dev'M. Dent2019-03-1511-74/+55
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cleanup and fixes See merge request hubzilla/core!1554
| | * | | | Cleanup and fixesMario2019-03-1511-74/+55
| |/ / / /
| | | * | use php_eol for all mail header generationzotlabs2019-03-162-14/+14
| | | | |
| | | * | use the php_eol constant for encoded subjectszotlabs2019-03-163-2/+3
| | |/ /
| | * | Merge branch 'dev' of ../hz into devzotlabs2019-03-141-2/+5
| |/| |
| | * | email_header_encode() producing lines of illegal length because header field ↵zotlabs2019-03-141-2/+5
| | | | | | | | | | | | | | | | length was not considered in length calculation.
* | | | fix typosMario Vavti2019-03-181-2/+2
| | | | | | | | | | | | (cherry picked from commit d486b030896d1b4d798dc3ea1806e492cdd4983a)
* | | | some more xss preventionMario Vavti2019-03-185-16/+16
| | | | | | | | | | | | (cherry picked from commit 968c6ed8be580c1098587738fefa27b31dc4f5ef)
* | | | use urlencodeMario Vavti2019-03-184-5/+5
| | | | | | | | | | | | (cherry picked from commit 2ec3e4a912777501f232d6255fe8ba5d0c147eee)
* | | | ENT_COMPAT will only take care of double-quotes. Use double-quotes here to ↵Mario Vavti2019-03-184-5/+5
| | | | | | | | | | | | | | | | | | | | prevent XSS (cherry picked from commit a086745ec021add5638a0527d4e8e14835591e93)
* | | | Merge branch 'dev'Mario Vavti2019-03-1411-100/+387
|\| | |
| * | | Merge branch 'dev' into 'dev'Mario2019-03-144-2/+40
| |\ \ \ | | | | | | | | | | | | | | | | | | | | two compatibility issues zot/zot6 See merge request hubzilla/core!1553
| | * \ \ Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-141-2/+2
| | |\ \ \
| | | * | | Merge branch 'dev' of ../hz into devzotlabs2019-03-131-2/+2
| | | |\| |
| | | | * | signature issue for zot6 content imported from zotfeeds to hubzillazotlabs2019-03-131-2/+2
| | | | | |
| | * | | | Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-143-0/+38
| | |\| | |
| | | * | | find unregistered z6 clones on hubzilla sites (does not happen automatically ↵zotlabs2019-03-133-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. Dent2019-03-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add zot6 to clonable networks See merge request hubzilla/core!1552
| | * | | | add zot6 to clonable networksMario Vavti2019-03-131-1/+1
| |/ / / /
| * | | | Merge branch 'dev' into 'dev'Mario2019-03-133-88/+239
| |\| | | | | | | | | | | | | | | | | | | | | | | Dev See merge request hubzilla/core!1551
| | * | | limit 1Mike Macgirvin2019-03-131-1/+1
| | |/ /
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMike Macgirvin2019-03-130-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dev' into 'dev'Mario2019-03-121-0/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | perform zot6 discovery in import_author_xchan See merge request hubzilla/core!1550
| * \ \ \ Merge branch 'dev' into 'dev'Mario2019-03-111-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 devMike Macgirvin2019-03-133-88/+239
| | | |/| |
| | | | * | rework authenticated item fetches (check ACL on the parent, not on the ↵zotlabs2019-03-121-56/+41
| | | | | | | | | | | | | | | | | | | | | | | | requested item)
| | | | * | add owner permission checks to AS item fetchzotlabs2019-03-121-2/+37
| | | | | |
| | | | * | typoszotlabs2019-03-121-8/+8
| | | | | |
| | | | * | Merge branch 'dev' of ../hz into devzotlabs2019-03-111-0/+9
| | | | |\ \
| | | | | * | check zot6 in import_author_xchanzotlabs2019-03-111-0/+9
| | | |_|/ / | | |/| | |
| | | | * | security updates for multiple xchanszotlabs2019-03-111-59/+189
| | | |/ / | | |/| |
| | | * | perform zot6 discovery in import_author_xchanMike Macgirvin2019-03-121-0/+9
| | |/ /
| | * | testing init_groups_visitor changes - also add virtual groups for both zot ↵zotlabs2019-03-101-13/+11
| | | | | | | | | | | | | | | | identities
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-100-0/+0
| | |\ \ | | |/ / | |/| |
| * | | Merge branch 'dev' into 'dev'Mario2019-03-105-3/+76
| |\ \ \ | | | | | | | | | | | | | | | | | | | | non-critical: port zot_record_preferred() See merge request hubzilla/core!1546
| | | * | init_groups_visitor: include xchans from all zot-like networkszotlabs2019-03-101-3/+21
| | |/ /
| | * | authenticated fetch fixeszotlabs2019-03-093-1/+53
| | | |
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-03-082-13/+10
| | |\ \ | | |/ / | |/| |
| * | | update changelogMario Vavti2019-03-081-1/+1
| | | | | | | | | | | | (cherry picked from commit 5b3824917d591b27c4797971c8253ed67b41dc5a)
| * | | Merge branch 'core_fixes_1' into 'dev'M. Dent2019-03-081-12/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | $sender is supposed to be string in libzot See merge request hubzilla/core!1544
| | * | | $sender is supposed to be string in libzotMario2019-03-081-12/+9
| |/ / /
| * | | Merge branch 'dev' into 'dev'M. Dent2019-03-081-5/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | fetch private objects using delivery channel credentials See merge request hubzilla/core!1545
| | | * | port zot_record_preferredzotlabs2019-03-081-2/+22
| | | | |
| | | * | It is in fact the 'Content Import' app string that needs to be translated. A ↵zotlabs2019-03-071-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 devzotlabs2019-03-072-0/+112
| | |/| | | | |/ / | |/| |
| * | | update changelogMario Vavti2019-03-071-0/+1
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2019-03-071-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | guest access tokens: xchan record not created on URL login See merge request hubzilla/core!1543
| * | | | changelogMario Vavti2019-03-061-0/+104
| | | | |