aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* another fix for z6_discover() and create a zot6 hubloc if applicableMario Vavti2019-03-282-2/+34
|
* fix various issues in z6_discover()Mario Vavti2019-03-271-3/+5
|
* Merge branch 'duplicate_fixes_1' into 'dev'Max Kostikov2019-03-251-5/+15
|\ | | | | | | | | if we have an uuid deduplicate by uuid otherwise by mid See merge request hubzilla/core!1573
| * if we have an uuid deduplicate by uuid otherwise by midMario Vavti2019-03-251-5/+15
| |
* | Merge branch 'patch-20190324a' into 'dev'Mario2019-03-251-0/+5
|\ \ | |/ |/| | | | | Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.php See merge request hubzilla/core!1572
| * Add ITEM_TYPE_CUSTOM support to Zotlabs/Module/Display.phpDM42.Net (Matt Dent)2019-03-241-0/+5
|/
* fix wrong field nameMario Vavti2019-03-241-2/+2
|
* Revert "item_store(): deduplicate by mid OR uuid"Mario Vavti2019-03-241-2/+1
| | | | This reverts commit d8ce0d0df0b7b58b3f2a1abfc26f455fb943f8ea.
* Merge branch 'items_fixes' into 'dev'Max Kostikov2019-03-241-1/+2
|\ | | | | | | | | item_store(): deduplicate by mid OR uuid possible fix for #1349 See merge request hubzilla/core!1570
| * item_store(): deduplicate by mid OR uuidMario Vavti2019-03-241-1/+2
|/
* Merge branch 'core_fixes' into 'dev'M. Dent2019-03-249-14/+14
|\ | | | | | | | | Core fixes See merge request hubzilla/core!1569
| * add punify() againMario2019-03-231-2/+2
| |
| * fix typoMario2019-03-231-1/+1
| |
| * fix subthread on sys channel itemsMario2019-03-231-1/+1
| |
| * fix revert accidental moving of Features.phpMario2019-03-233-105/+105
| |
| * aparently we do not use underscores anymore. this fixes spaming of dreports ↵Mario2019-03-231-1/+1
| | | | | | | | with recipient not found entries for our own xchan
| * fix variables for xporof_locale and xprof_postcodeMario2019-03-231-4/+4
| |
| * revert accidental moving of Features.phpMario2019-03-231-0/+0
| |
| * fix 48 hours timeframe check and remove unused var in mod changeaddrMario2019-03-232-2/+2
| |
| * revert accidental moving of Enotify.phpMario2019-03-231-0/+0
| |
| * fix typoMario2019-03-232-1/+1
| |
| * fix wrong variable in unused functionMario2019-03-231-1/+1
| |
| * Webfinger::zot_url() requires a string (webfinger address), empty var given ↵Mario2019-03-231-1/+1
| | | | | | | | in update_directory_entry()
| * db_columns() requires a string, empty var given in ↵Mario2019-03-231-1/+1
|/ | | | process_channel_sync_delivery()
* bump versionMario Vavti2019-03-211-1/+1
|
* 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 follow See merge request hubzilla/core!1563
| * 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
|\ \ | | | | | | | | | | | | Video See merge request hubzilla/core!1561
| * | 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... See merge request hubzilla/core!1560
| * | mysql: remove some unused indices and add thr_parent index. pgsql: sync ↵Mario Vavti2019-03-194-25/+89
|/ / | | | | | | indices with mysql indices after testing on hub.disroot.org and add thr_parent
* | Merge branch 'dev' into 'dev'Mario2019-03-193-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 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | composer: add phpmd and phpcs to require-dev See merge request hubzilla/core!1557
| * | | | 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 ↵Mario Vavti2019-03-184-5/+5
| | | | | | | | | | | | | | | | | | | | prevent XSS
* | | | | Merge branch 'dev' into 'dev'Mario2019-03-189-19/+132
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | misc fixes See merge request hubzilla/core!1558
| * | | | | clone systems apps to the extent possible, auto-configure imagick thumbnail ↵Zot2019-03-189-19/+132
|/ / / / / | | | | | | | | | | | | | | | binary during setup if possible
| | * | / 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:25:07 +0000