aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* optimize autoload cache and update changelogMario Vavti2019-03-213-6/+32
* Merge branch 'dev' into 'dev'Mario2019-03-211-0/+1
|\
| * hubzilla core issue #1356 , permissions not getting decrypted on followzotlabs2019-03-201-0/+1
* | another whitespace to trigger testsMario Vavti2019-03-211-1/+0
* | just whitespace to trigger a new build testMario Vavti2019-03-201-1/+0
* | Merge branch 'video' into 'dev'M. Dent2019-03-201-0/+22
|\ \
| * | VideoMario2019-03-201-0/+22
|/ /
* | Merge branch 'update_1231' into 'dev'Max Kostikov2019-03-194-25/+89
|\ \
| * | mysql: remove some unused indices and add thr_parent index. pgsql: sync indic...Mario Vavti2019-03-194-25/+89
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-03-193-3/+25
|\|
| * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devzotlabs2019-03-1813-23/+192
| |\
| | * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-192-3/+21
| | |\
| | * \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devMike Macgirvin2019-03-194-2/+171
| | |\ \ | |_|/ / |/| | |
* | | | Merge branch 'dev' into 'dev'M. Dent2019-03-194-2/+171
|\ \ \ \
| * | | | add phpmd and phpcs to require-devMario2019-03-174-2/+171
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMike Macgirvin2019-03-199-21/+21
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | fix typosMario Vavti2019-03-181-2/+2
* | | | | some more xss preventionMario Vavti2019-03-185-16/+16
* | | | | use urlencodeMario Vavti2019-03-184-5/+5
* | | | | ENT_COMPAT will only take care of double-quotes. Use double-quotes here to pr...Mario Vavti2019-03-184-5/+5
* | | | | Merge branch 'dev' into 'dev'Mario2019-03-189-19/+132
|\ \ \ \ \
| * | | | | clone systems apps to the extent possible, auto-configure imagick thumbnail b...Zot2019-03-189-19/+132
|/ / / / /
| | * | / share encoding issue between hz and zapzotlabs2019-03-181-0/+4
| | | |/ | | |/|
| | * | Merge branch 'dev' of ../hz into devzotlabs2019-03-182-3/+21
| | |\ \ | | | |/ | | |/|
| | | * messagefilter enhancements, fix edge case in unsupported advisory privacyzotlabs2019-03-182-3/+21
| | * | clone systems apps to the extent possible, auto-configure imagick thumbnail b...zotlabs2019-03-174-1/+108
| | |/
| | * calling unserialize on array in util/service_classzotlabs2019-03-171-1/+6
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMike Macgirvin2019-03-1813-83/+67
| | |\ | |_|/ |/| |
* | | Merge branch 'dreport_fixes' into 'dev'Max Kostikov2019-03-172-10/+13
|\ \ \ | |/ / |/| |
| * | fix dreport redeliverMario Vavti2019-03-152-10/+13
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-03-151-2/+5
|\ \
* \ \ Merge branch 'cleanup' into 'dev'M. Dent2019-03-1511-74/+55
|\ \ \
| * | | 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
* | Merge branch 'dev' into 'dev'Mario2019-03-144-2/+40
|\ \
| * \ 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
| | |/
* | | Merge branch 'core_fixes_2' into 'dev'M. Dent2019-03-131-1/+1
|\ \ \
| * | | add zot6 to clonable networksMario Vavti2019-03-131-1/+1
|/ / /
* | | Merge branch 'dev' into 'dev'Mario2019-03-133-88/+239
|\| |
| * | 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
|\ \
* \ \ Merge branch 'dev' into 'dev'Mario2019-03-111-7/+23
|\ \ \