aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Merge branch 'z6_discover_fixes' into 'dev'Max Kostikov2019-03-292-5/+39
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | fix typoMario Vavti2019-03-281-2/+2
| | * | | 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
| | |/ /
| * | | Fix wrong bracketMax Kostikov2019-03-271-2/+2
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-03-271-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix wrong permissions on attached images in personal messagesMax Kostikov2019-03-271-2/+2
| |/ /
| * | Merge branch 'duplicate_fixes_1' into 'dev'Max Kostikov2019-03-251-5/+15
| |\ \
| | * | 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.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
| * | Merge branch 'items_fixes' into 'dev'Max Kostikov2019-03-241-1/+2
| |\ \
| | * | item_store(): deduplicate by mid OR uuidMario Vavti2019-03-241-1/+2
| |/ /
| * | Merge branch 'core_fixes' into 'dev'M. Dent2019-03-249-14/+14
| |\ \
| | * | 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 w...Mario2019-03-231-1/+1
| | * | 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 i...Mario2019-03-231-1/+1
| | * | db_columns() requires a string, empty var given in process_channel_sync_deliv...Mario2019-03-231-1/+1
| |/ /
* | | Merge branch 'master' of https://framagit.org/hubzilla/coreMario Vavti2019-04-081-3/+3
|\ \ \
| * | | security: perms_pending not evaluated correctlyzotlabs2019-04-061-3/+3
* | | | Revert "item_store(): deduplicate by mid OR uuid"Mario Vavti2019-03-241-2/+1
* | | | item_store(): deduplicate by mid OR uuidMario Vavti2019-03-241-1/+2
|/ / /
* | | bump version4.0.1Mario Vavti2019-03-211-1/+1
* | | Merge branch 'dev'Mario Vavti2019-03-2132-135/+537
|\| |
| * | 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 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
| |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 10:19:28 +0000