aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | merge branch files_ng into devMario2020-12-1430-587/+1684
| | |
| * | try to prevent hubloc confusion in some placesMario2020-12-125-48/+59
| | | | | | | | | (cherry picked from commit 61cfeb5bdb749319357912d958cd13304b895bce)
| * | make gprobe look for zot6 onlyMario2020-12-121-1/+1
| | | | | | | | | (cherry picked from commit 1d3437aa419adde319d2a3f5d98e7f8fe4418f27)
| * | Merge branch 'dev' into 'dev'Mario2020-12-121-5/+0
| |\ \ | | | | | | | | | | | | | | | | Remove duplicate delete terms query See merge request hubzilla/core!1885
| | * | Remove duplicate delete terms queryMax Kostikov2020-12-121-5/+0
| |/ /
| | * Remove duplicate delete terms queryMax Kostikov2020-12-121-5/+0
| | |
| | * Merge branch 'dev' into 'dev'Max Kostikov2020-12-124-26/+27
| | |\ | | |/ | |/| | | | | | | Dev sync See merge request kostikov/core!3
| * | fix hubloc issue in mod getfileMario2020-12-112-12/+13
| | | | | | | | | (cherry picked from commit b0b9b9f28974f9016e47491e81876224c57a7e3b)
| * | Merge branch 'dev' into 'dev'Mario2020-12-071-11/+11
| |\ \ | | | | | | | | | | | | | | | | Skip profile photo query from addons for undefined channel id See merge request hubzilla/core!1884
| | * | Skip profile photo query from addons for undefined channel idMax Kostikov2020-12-071-11/+11
| | | |
| * | | remove announce activity from response activites arrayMario2020-12-072-14/+14
| |/ / | | | | | | (cherry picked from commit 52c78c757ae73082ed29e48707b2313e65020db3)
| | * FormattingMax Kostikov2020-12-041-9/+9
| | |
| | * Skip profile photo query from addons for undefined channel idMax Kostikov2020-12-041-10/+10
| | |
| | * Merge branch 'dev' into 'dev'Max Kostikov2020-12-04434-8722/+27251
| | |\ | | |/ | |/| | | | | | | Dev sync See merge request kostikov/core!2
| * | changelogMario2020-12-011-0/+5
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-12-011-1/+1
| |\ \
| | * | dismiss title in response activityMario2020-11-281-1/+1
| | | | | | | | | | | | (cherry picked from commit eb2ad3fc438544192cda95d88a4c2a54ec1e0014)
| * | | missing parenthesisMario2020-12-011-0/+1
| | | |
| * | | Ãfix regerssion in updating the primaryMario2020-12-011-28/+34
| |/ /
| * | run composer install --no-devMario2020-11-274-3/+35
| | |
| * | run composer install --no-devMario2020-11-278-12593/+10
| | |
| * | composer autoload dumpMario2020-11-273-23/+23
| | |
| * | bring back require but with the correct pathMario2020-11-271-3/+3
| | |
| * | fix languagedetect warnmingMario2020-11-271-3/+3
| | |
| * | update composer libsMario2020-11-27384-6243/+36313
| | |
* | | version 5.0.85.0.8Mario2020-12-301-1/+1
| | |
* | | changelogMario2020-12-301-0/+13
| | | | | | | | | (cherry picked from commit 817e72846e2d2fe4e331262c91f51057e44f6c0a)
* | | escape both single and double quotes for the notifications title. fixes ↵Mario2020-12-301-33/+33
| | | | | | | | | | | | | | | issue #1503 (cherry picked from commit 11d61a744dcdbc47cdbad2122ca1e5417b8d6235)
* | | random_profile: return zot6 entriesMario Vavti2020-12-301-1/+1
| | | | | | | | | (cherry picked from commit 5cefdbf98519ef6cb5dbd397e19ff9d0d79258d3)
* | | dirserach: return zot6 entriesMario Vavti2020-12-301-2/+2
| | | | | | | | | (cherry picked from commit 5485f96625d03dab1f8f9e9fdf3f6ea5180509c9)
* | | Revert "Fix sync item with Zot connections"Max Kostikov2020-12-301-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 3db4aa69440553788d8f46cf4bbfb38ca4f09130 (cherry picked from commit c063fe07205bb22401d2a2c29a1829e17e5b7a66)
* | | Deduplicate contacts list on autocompleteMax Kostikov2020-12-301-21/+32
| | | | | | | | | (cherry picked from commit d889547b26bd203b552bb53e8931a5bec84a6918)
* | | sse: fix issue with direct message notificationssMario2020-12-301-14/+14
| | | | | | | | | (cherry picked from commit d5eeb948d51ac6619f89045984698d8d55bbb3f2)
* | | Do not revalidate cached photosMax Kostikov2020-12-301-3/+4
| | | | | | | | | (cherry picked from commit ca051e943f172ce272e7ecc5f77cfcc265d0e158)
* | | Implement Imagemagick resources consumption limitingMax Kostikov2020-12-301-0/+4
| | | | | | | | | (cherry picked from commit 36d89d02e13ed856de6bace89bfbed05205005db)
* | | owa specify keyMario2020-12-301-1/+1
| | | | | | | | | (cherry picked from commit f2258d4202c1ff54c94e2c383aa153b13b79b47b)
* | | fix issue where an array was passed to get_key() instead of a stringMario2020-12-301-9/+11
| | | | | | | | | (cherry picked from commit 81a1aedeb9a4e07c3d1e11905ad3e2434d635e86)
* | | changelog5.0.7Mario2020-12-211-0/+7
| | | | | | | | | (cherry picked from commit 638f7a1c89b84e304a2900a3c70fae2c8b0a18b7)
* | | version 5.0.7Mario2020-12-211-1/+1
| | |
* | | Fix CardDAV address book IDMax Kostikov2020-12-211-0/+1
| | | | | | | | | (cherry picked from commit 6579007ca080a7d126be0c3130043f754eb6ac2e)
* | | Use Zot6 for CardDAV and CalDAV sync between clonesMax Kostikov2020-12-211-18/+19
| | | | | | | | | (cherry picked from commit c596fb14bb247d7841742e7a8451e51af38ac7e4)
* | | handle owa with hubloc_id_url onlyMario Vavti2020-12-212-13/+7
| | | | | | | | | (cherry picked from commit ed4bf1c13dd183647499ce4e18c869988f674368)
* | | do not json_encode the attach array - fixes #1499Mario2020-12-211-232/+231
| | | | | | | | | (cherry picked from commit 5b24225251a120e6bdba8dd1a16e9d5c3172a61d)
* | | changelog for version 5.0.65.0.6Mario2020-12-171-0/+13
| | | | | | | | | (cherry picked from commit 269efb9c1e57fadcc6e1ad6d6529a4eefc36ff48)
* | | update to fix empty hubloc_id_url caused by clone import bug for zot hublocs ↵Mario Vavti2020-12-172-2/+36
| | | | | | | | | | | | which was fixed in 4693069a0618775167fd5c5b8c91b80f8a832da0
* | | restrict owa to zot6 and zot network until the hubloc madness with ↵Mario Vavti2020-12-171-2/+2
| | | | | | | | | | | | | | | activitypub and possibly also diaspora will be solved (cherry picked from commit 7ebba75fa25a51ec1d751ba3b27b8fe70f166224)
* | | fix issue with abconfig when cloning a channelMario2020-12-172-7/+21
| | | | | | | | | (cherry picked from commit f13bff2a767cf3a575698f55dad978c7a4cc1a72)
* | | owa: dismiss deleted hublocsMario2020-12-171-6/+6
| | | | | | | | | (cherry picked from commit 006a409eb80317a89d48edb53e9d40b357badffd)
* | | use refresh_all in mod importMario2020-12-171-1/+1
| | | | | | | | | (cherry picked from commit 59f1c038fe3d26449e3d4475dba89f10165f71f6)
* | | try to fix more hubloc anomalies: use refresh_all in ↵Mario2020-12-172-43/+45
| | | | | | | | | | | | | | | remove_obsolete_hublocs() and use Libzot::encode_locations() instead of zot_encode_locations() in notifier (cherry picked from commit dec4ceabb5e036dfdab50f499dd2a26fe4eeebf7)