aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* wiki: urlencode the entire share linkMario Vavti2019-05-171-2/+2
| | | (cherry picked from commit aa120e0478b8a7e0eabcbd7b8d7eefd515ff5347)
* use escape_tags() wiki headersMario Vavti2019-05-171-2/+2
| | | (cherry picked from commit e7f1f496c5977ae290ea1457ea5c117dd29676f6)
* Merge branch 'patch-1' into 'master'Mario2019-05-171-2/+1
|\ | | | | | | | | Fix a really disturbing comment See merge request hubzilla/core!1650
| * Fix a really disturbing comment Xanthor2019-05-171-2/+1
|/
* bump version4.0.3Mario2019-04-261-1/+1
|
* update changelogMario Vavti2019-04-261-0/+11
| | | (cherry picked from commit a518471a270795425a2b835fae585d26303beebd)
* permissions cleanupzotlabs2019-04-261-4/+12
| | | (cherry picked from commit 2d886b65ce9c03a4330b4d9609d02a8d1fd47d9b)
* add attachments to zot6 event objects, add zot6 to federated transports ↵zotlabs2019-04-262-2/+7
| | | | | (webfinger) (cherry picked from commit 0615709a7ab7bba66b2a07d593e84a35ed083edb)
* import/export zot6 hublocs+xchansZot2019-04-262-6/+48
| | | (cherry picked from commit e2dfa1d72f36ecc85059a7f2a38084a4919eb704)
* update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to ↵Zot2019-04-261-3/+4
| | | | | master) (cherry picked from commit f8c583636cd3d5d6004cd0279ca887fa05fbf315)
* hubloc confusion in magic authZot2019-04-266-28/+89
| | | (cherry picked from commit 3c8f8b76aa35eed1e612cb20537b8648bef3daca)
* Fix infinite loop using postgres as backendDaniel Lowe2019-04-261-12/+6
| | | | | | | | unescapebin is handed a string in some cases, and it causes an infinite loop when it does. This ensures that the argument is a resource before loading its contents. (cherry picked from commit 9a6531e2a278f7462241ddde7b3e5363d13b5e58)
* required php version not available but allowed to continuezotlabs2019-04-261-1/+1
| | | (cherry picked from commit 6feddcbced5c26f18216063efda5967e706748b7)
* version bump4.0.2Mario Vavti2019-04-081-1/+1
|
* 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
| | |\ | | | | | | | | | | | | | | | | security: perms_pending not evaluated correctly See merge request hubzilla/core!1583
| | | * 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prevent return wrong profile photo modification date by plugin See merge request hubzilla/core!1582
| | | * | | 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
| |\| | | | | | | | | | | | | | | | | | | | | | | 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
| | | |