Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | wiki: urlencode the entire share link | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | | | (cherry picked from commit aa120e0478b8a7e0eabcbd7b8d7eefd515ff5347) | ||||
* | use escape_tags() wiki headers | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | | | (cherry picked from commit e7f1f496c5977ae290ea1457ea5c117dd29676f6) | ||||
* | Merge branch 'patch-1' into 'master' | Mario | 2019-05-17 | 1 | -2/+1 |
|\ | | | | | | | | | Fix a really disturbing comment See merge request hubzilla/core!1650 | ||||
| * | Fix a really disturbing comment | Xanthor | 2019-05-17 | 1 | -2/+1 |
|/ | |||||
* | bump version4.0.3 | Mario | 2019-04-26 | 1 | -1/+1 |
| | |||||
* | update changelog | Mario Vavti | 2019-04-26 | 1 | -0/+11 |
| | | | (cherry picked from commit a518471a270795425a2b835fae585d26303beebd) | ||||
* | permissions cleanup | zotlabs | 2019-04-26 | 1 | -4/+12 |
| | | | (cherry picked from commit 2d886b65ce9c03a4330b4d9609d02a8d1fd47d9b) | ||||
* | add attachments to zot6 event objects, add zot6 to federated transports ↵ | zotlabs | 2019-04-26 | 2 | -2/+7 |
| | | | | | (webfinger) (cherry picked from commit 0615709a7ab7bba66b2a07d593e84a35ed083edb) | ||||
* | import/export zot6 hublocs+xchans | Zot | 2019-04-26 | 2 | -6/+48 |
| | | | (cherry picked from commit e2dfa1d72f36ecc85059a7f2a38084a4919eb704) | ||||
* | update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to ↵ | Zot | 2019-04-26 | 1 | -3/+4 |
| | | | | | master) (cherry picked from commit f8c583636cd3d5d6004cd0279ca887fa05fbf315) | ||||
* | hubloc confusion in magic auth | Zot | 2019-04-26 | 6 | -28/+89 |
| | | | (cherry picked from commit 3c8f8b76aa35eed1e612cb20537b8648bef3daca) | ||||
* | Fix infinite loop using postgres as backend | Daniel Lowe | 2019-04-26 | 1 | -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 continue | zotlabs | 2019-04-26 | 1 | -1/+1 |
| | | | (cherry picked from commit 6feddcbced5c26f18216063efda5967e706748b7) | ||||
* | version bump4.0.2 | Mario Vavti | 2019-04-08 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' | Mario Vavti | 2019-04-08 | 164 | -228/+27571 |
|\ | |||||
| * | more changelog | Mario Vavti | 2019-04-08 | 1 | -0/+1 |
| | | |||||
| * | changelog and version bump | Mario Vavti | 2019-04-08 | 2 | -1/+24 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-04-07 | 2 | -24/+27 |
| |\ | |||||
| | * | Merge branch 'dev' into 'dev' | Mario | 2019-04-06 | 1 | -3/+3 |
| | |\ | | | | | | | | | | | | | | | | | security: perms_pending not evaluated correctly See merge request hubzilla/core!1583 | ||||
| | | * | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-04-05 | 1 | -3/+3 |
| | | |\ | |||||
| | | | * | security: perms_pending not evaluated correctly | zotlabs | 2019-04-05 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-04-05 | 1 | -21/+24 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prevent return wrong profile photo modification date by plugin See merge request hubzilla/core!1582 | ||||
| | | * | | | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -5/+5 |
| | | | | | | |||||
| | | * | | | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update Photo.php | Max Kostikov | 2019-04-05 | 1 | -3/+4 |
| | | | | | | |||||
| | | * | | | Prevent return wrong profile photo modification date by plugin | Max Kostikov | 2019-04-05 | 1 | -21/+23 |
| | | | | | | |||||
| * | | | | | enable list views | Mario Vavti | 2019-04-06 | 3 | -1/+7 |
| | | | | | | |||||
| * | | | | | upgrade cdav calendar to version 4 | Mario Vavti | 2019-04-06 | 138 | -159/+27369 |
| |/ / / / | |||||
| * | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-04 | 1 | -4/+16 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Sync cover photo removal with clones See merge request hubzilla/core!1581 | ||||
| | * | | | Skip removal if no cover image found | Max Kostikov | 2019-04-04 | 1 | -6/+7 |
| | | | | | |||||
| | * | | | Sync cover photo removal with clones | Max Kostikov | 2019-04-03 | 1 | -2/+13 |
| |/ / / | |||||
| * | | | Fix sync cover photo for clonned channels | Max Kostikov | 2019-04-03 | 1 | -2/+5 |
| | | | | |||||
| * | | | Remove suggest channels from features | Mario | 2019-04-02 | 1 | -8/+0 |
| | | | | |||||
| * | | | Revert "Revert "suggestion widget using feature_enabled still - upgrade to ↵ | Mario | 2019-04-02 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | use apps."" This reverts commit a0a2c27973d8b923c3597c611eb23a8a1b010a85 | ||||
| * | | | Revert "suggestion widget using feature_enabled still - upgrade to use apps." | Mario | 2019-04-02 | 1 | -4/+2 |
| | | | | | | | | | | | | This reverts commit b2bdc73164f7ede118febf823f729e57e7f4950f | ||||
| * | | | Merge branch 'cover_photo_fixes' into 'dev' | Max Kostikov | 2019-04-01 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | missing string See merge request hubzilla/core!1580 | ||||
| | * | | | missing string | Mario Vavti | 2019-04-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Add text to cover remove button | Max Kostikov | 2019-04-01 | 1 | -0/+1 |
| |/ / / | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-01 | 3 | -2/+13 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Add remove cover photo function See merge request hubzilla/core!1577 | ||||
| | * | | | Add submit button styling | Max Kostikov | 2019-03-30 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add remove cover photo processing | Max Kostikov | 2019-03-30 | 1 | -0/+10 |
| | | | | | |||||
| | * | | | Add remove cover button | Max Kostikov | 2019-03-30 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | Mario | 2019-04-01 | 4 | -4/+20 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | check service class limits when syncing files See merge request hubzilla/core!1578 | ||||
| | * | | | Merge branch 'dev' of ../hz into dev | zotlabs | 2019-03-31 | 2 | -3/+5 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | suggestion widget using feature_enabled still - upgrade to use apps. | zotlabs | 2019-03-31 | 1 | -2/+4 |
| | | | | | |||||
| | | * | | nomadic is not a parameter in the hz version of encode_item_collection | zotlabs | 2019-03-21 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | check service class limits when syncing files | zotlabs | 2019-03-30 | 1 | -0/+14 |
| | | | | | |||||
| | * | | | we no longer use xchan_instance_url - this is an abook thing | zotlabs | 2019-03-30 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Revert "Add submit button styling" | Max Kostikov | 2019-03-30 | 1 | -1/+1 |
| |/ / / | | | | | | | | | This reverts commit 0b996245d5ef54d23e7b06307c2b0abac5988dce | ||||
| * | | | Add submit button styling | Max Kostikov | 2019-03-30 | 1 | -1/+1 |
| | | | |