aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* upgrade cdav calendar to version 4Mario Vavti2019-04-06138-159/+27369
|
* Merge branch 'dev' into 'dev'Mario2019-04-041-4/+16
|\ | | | | | | | | Sync cover photo removal with clones See merge request hubzilla/core!1581
| * Skip removal if no cover image foundMax Kostikov2019-04-041-6/+7
| |
| * Sync cover photo removal with clonesMax Kostikov2019-04-031-2/+13
|/
* Fix sync cover photo for clonned channelsMax Kostikov2019-04-031-2/+5
|
* Remove suggest channels from featuresMario2019-04-021-8/+0
|
* Revert "Revert "suggestion widget using feature_enabled still - upgrade to ↵Mario2019-04-021-2/+4
| | | | | use apps."" This reverts commit a0a2c27973d8b923c3597c611eb23a8a1b010a85
* Revert "suggestion widget using feature_enabled still - upgrade to use apps."Mario2019-04-021-4/+2
| | | This reverts commit b2bdc73164f7ede118febf823f729e57e7f4950f
* Merge branch 'cover_photo_fixes' into 'dev'Max Kostikov2019-04-010-0/+0
|\ | | | | | | | | missing string See merge request hubzilla/core!1580
| * missing stringMario Vavti2019-04-011-0/+1
| |
* | Add text to cover remove buttonMax Kostikov2019-04-011-0/+1
|/
* Merge branch 'dev' into 'dev'Mario2019-04-013-2/+13
|\ | | | | | | | | Add remove cover photo function See merge request hubzilla/core!1577
| * Add submit button stylingMax Kostikov2019-03-301-1/+1
| |
| * Add remove cover photo processingMax Kostikov2019-03-301-0/+10
| |
| * Add remove cover buttonMax Kostikov2019-03-301-1/+2
| |
* | Merge branch 'dev' into 'dev'Mario2019-04-014-4/+20
|\ \ | | | | | | | | | | | | check service class limits when syncing files See merge request hubzilla/core!1578
| * \ Merge branch 'dev' of ../hz into devzotlabs2019-03-312-3/+5
| |\ \
| | * | suggestion widget using feature_enabled still - upgrade to use apps.zotlabs2019-03-311-2/+4
| | | |
| | * | nomadic is not a parameter in the hz version of encode_item_collectionzotlabs2019-03-211-1/+1
| | | |
| * | | check service class limits when syncing fileszotlabs2019-03-301-0/+14
| | | |
| * | | we no longer use xchan_instance_url - this is an abook thingzotlabs2019-03-301-1/+1
| | | |
* | | | Revert "Add submit button styling"Max Kostikov2019-03-301-1/+1
|/ / / | | | | | | This reverts commit 0b996245d5ef54d23e7b06307c2b0abac5988dce
* | | Add submit button stylingMax Kostikov2019-03-301-1/+1
| | |
* | | Merge branch 'connections_ordering' into 'dev'M. Dent2019-03-291-2/+16
|\ \ \ | | | | | | | | | | | | | | | | add backend support for connections ordering See merge request hubzilla/core!1576
| * | | add backend support for connections orderingMario Vavti2019-03-271-2/+16
| | | |
* | | | backslashMario Vavti2019-03-291-1/+1
| | | |
* | | | missing use declarationMario Vavti2019-03-291-0/+2
| | | |
* | | | Merge branch 'z6_discover_fixes' into 'dev'Max Kostikov2019-03-292-5/+39
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575
| * | | 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 messages See merge request hubzilla/core!1574
| * | 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 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
| | |