aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev'Mario Vavti2019-04-08164-228/+27571
|\
| * more changelogMario Vavti2019-04-081-0/+1
| * changelog and version bumpMario Vavti2019-04-082-1/+24
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-04-072-24/+27
| |\
| | * Merge branch 'dev' into 'dev'Mario2019-04-061-3/+3
| | |\
| | | * Merge branch 'dev' of ../hz into devzotlabs2019-04-051-3/+3
| | | |\
| | | | * security: perms_pending not evaluated correctlyzotlabs2019-04-051-3/+3
| | * | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-051-21/+24
| | |\ \ \
| | | * | | Update Photo.phpMax Kostikov2019-04-051-5/+5
| | | * | | Update Photo.phpMax Kostikov2019-04-051-1/+1
| | | * | | Update Photo.phpMax Kostikov2019-04-051-3/+4
| | | * | | Prevent return wrong profile photo modification date by pluginMax Kostikov2019-04-051-21/+23
| * | | | | enable list viewsMario Vavti2019-04-063-1/+7
| * | | | | upgrade cdav calendar to version 4Mario Vavti2019-04-06138-159/+27369
| |/ / / /
| * | | | Merge branch 'dev' into 'dev'Mario2019-04-041-4/+16
| |\| | |
| | * | | 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 us...Mario2019-04-021-2/+4
| * | | Revert "suggestion widget using feature_enabled still - upgrade to use apps."Mario2019-04-021-4/+2
| * | | Merge branch 'cover_photo_fixes' into 'dev'Max Kostikov2019-04-010-0/+0
| |\ \ \
| | * | | 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 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
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | 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
| |/ / /
| * | | 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 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 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
| |\ \ \ | | |/ / | |/| |