aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'translation-pl' into 'dev'Mario2021-01-2789-8690/+48639
|\ | | | | | | | | | | | | | | | | | | | | Translation pl Polish translations (used on hub.hubzilla.pl) - view/pl: 100% - doc/pl: ~40% - doc/context/pl: 100% - doc/macros/pl: 100% See merge request hubzilla/core!1902
| * Merge branch 'translation-pl' into 'dev'Andrzej S. Budziński2021-01-2789-8690/+48639
|/ | | | | | | | | | | | Translation pl Polish translations (used on hub.hubzilla.pl) - view/pl: 100% - doc/pl: ~40% - doc/context/pl: 100% - doc/macros/pl: 100% See merge request hubzilla/core!1902
* port fix from zap: catch a complex edge case where some public stream ↵Mario2021-01-261-4/+6
| | | | comments were not being delivered and should have been
* use mail envelope instead of lock icon for direct messagesMario2021-01-265-3/+8
|
* port youtube embed fix from zapMario2021-01-261-0/+7
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-261-4/+1
|\
| * fix issues in Activity::encode_item_collection() after recent changesMario Vavti2021-01-261-4/+1
| |
* | Libzot::fetch_conversation() fixesMario2021-01-262-37/+28
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2021-01-256-148/+184
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-252-0/+6
| |\
| | * Run storageconv from web server userCharlie Root2021-01-252-0/+6
| | |
| * | expose manual public item import from searchbar, set commen_policy in ↵Mario2021-01-254-148/+178
| |/ | | | | | | Activity::store() to what we get if we get something otherwise default to authenticated, comments by the owner have the relay flag set and therefor $perm will be not be set to post_comments - always check if we own the parent in lib/libzot (not only if $perm = send_stream) if otherwise not allowed
* / invoke channel discovery by hash instead of address and add thread listeners ↵Mario Vavti2021-01-252-5/+9
|/ | | | only if we also send them the post
* Merge branch 'dev' into 'dev'Mario2021-01-247-84/+168
|\ | | | | | | | | Add support filesystem storage for xchan profile photos See merge request hubzilla/core!1898
| * Add support filesystem storage for xchan profile photosMax Kostikov2021-01-247-84/+168
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-242-2/+14
|\|
| * Merge branch 'dev' into 'dev'Max Kostikov2021-01-231-1/+1
| |\ | | | | | | | | | | | | Variable typo See merge request hubzilla/core!1897
| | * Variable typoMax Kostikov2021-01-231-1/+1
| |/
| * Merge branch 'dev' into 'dev'Max Kostikov2021-01-231-1/+4
| |\ | | | | | | | | | | | | Don't fetch profile photos from own hub See merge request hubzilla/core!1896
| | * Don't fetch profile photos from own hubMax Kostikov2021-01-231-1/+4
| | |
| * | Do not store multiple profile images thumbnailsMax Kostikov2021-01-231-1/+10
| | |
* | | revert externals/zotfeed functionality due to scaling issues. Save zotfeed ↵Mario2021-01-243-51/+32
| | | | | | | | | | | | consumers that are not our contacts in thread listeners
* | | extra check for item_private in fetch_and_store_parents()Mario2021-01-241-5/+22
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2021-01-231-1/+1
|\| | | | | | | | | Bump DB update version See merge request hubzilla/core!1895
| * Bump DB update versionMax Kostikov2021-01-231-1/+1
| |
| * Merge branch 'dev' into 'dev'Max Kostikov2021-01-2313-424/+922
| |\ | |/ |/| | | | | Dev sync See merge request kostikov/core!3
* | Merge branch 'dev' into 'dev'Max Kostikov2021-01-232-2/+25
|\| | | | | | | | | | | # Conflicts: # Zotlabs/Daemon/Cache_query.php # include/contact_widgets.php # include/taxonomy.php
| * Remove duplicated profile photosMax Kostikov2021-01-231-0/+24
| |
| * Fix duplicate profile photos creation for clonesMax Kostikov2021-01-231-2/+1
| |
| * Higher log levelMax Kostikov2021-01-211-1/+1
| |
| * Process channel categories list in backgroundMax Kostikov2021-01-201-17/+21
| |
| * Process public tags cloud in backgroundMax Kostikov2021-01-201-24/+26
| |
| * Implement SQL query background cachingMax Kostikov2021-01-201-0/+34
| |
| * Swap key and cat for running pid trackingMax Kostikov2021-01-201-4/+4
| |
| * Merge branch 'dev' into 'dev'Max Kostikov2021-01-2011-1692/+1997
| |\ | | | | | | | | | | | | Dev sync See merge request kostikov/core!2
* | | fix ramsey/uuid exceptionMario2021-01-231-3/+3
| | |
* | | Encode SQL query arrayMax Kostikov2021-01-221-1/+1
| | |
* | | Encode SQL query arrayMax Kostikov2021-01-221-1/+1
| | |
* | | Decode SQL query arrayMax Kostikov2021-01-221-1/+3
| | |
* | | cleanupMario2021-01-223-39/+37
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2021-01-228-131/+639
|\ \ \
| * | | fix encode_item_collection()Mario2021-01-221-4/+10
| | | |
| * | | implement externals via zot6 and zotfeed - part 1Mario2021-01-225-84/+546
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2021-01-214-45/+85
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Implement SQL query background caching See merge request hubzilla/core!1894
| | * | | Implement SQL query background cachingMax Kostikov2021-01-214-45/+85
| |/ / /
* / / / implement externals via zot6 and zotfeed - part 2Mario Vavti2021-01-223-32/+66
|/ / /
* | | cleanup lib/libsyncMario2021-01-211-266/+263
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2021-01-201-1/+2
|\ \ \ | | |/ | |/|
| * | Merge branch 'dev' into 'dev'Max Kostikov2021-01-201-1/+2
| |\| | | | | | | | | | | | | Use Zot6 on pinned content sync between clones See merge request hubzilla/core!1893
| | * Update Pin.phpMax Kostikov2021-01-201-1/+1
| | |