aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix issue where an array was passed to get_key() instead of a stringMario2020-12-211-9/+11
|
* changelogMario2020-12-211-0/+7
|
* Merge branch 'dev' into 'dev'Max Kostikov2020-12-203-23/+20
|\ | | | | | | | | Use Zot6 for CardDAV and CalDAV sync between clones See merge request hubzilla/core!1886
| * Fix CardDAV address book IDMax Kostikov2020-12-191-0/+1
| |
| * Use Zot6 for CardDAV and CalDAV sync between clonesMax Kostikov2020-12-191-18/+19
| |
| * Merge branch 'dev' into 'dev'Max Kostikov2020-12-1946-1033/+2335
| |\ | |/ |/| | | | | Dev sync See merge request kostikov/core!4
* | refresh_all will be called from the notifier in Daemon/DirectoryMario2020-12-191-5/+0
| |
* | deprecate ! and !! forum tagsMario2020-12-183-11/+16
| |
* | flag forums where we do not have post permissions and filter them from the ↵Mario2020-12-182-4/+36
| | | | | | | | acl selector
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2020-12-181-232/+231
|\ \
| * | do not json_encode the attach array - fixes #1499Mario2020-12-171-232/+231
| | |
* | | handle owa with hubloc_id_url onlyMario Vavti2020-12-182-13/+7
|/ /
* | changelog for version 5.0.6Mario2020-12-171-0/+13
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-12-173-4/+38
|\ \
| * | 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
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2020-12-175-57/+92
| |\ \
| * | | 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
* | | | files_ng: provide bbcode snippets in the info panelMario2020-12-173-6/+48
| |/ / |/| |
* | | files_ng: fix regression in finding the right path in certain situations and ↵Mario2020-12-163-25/+55
| | | | | | | | | | | | add a info panel with attach and zrl bbcode
* | | files_ng: implement lockviewMario2020-12-162-31/+36
| | |
* | | fix regression in files aclselectMario2020-12-151-1/+1
|/ /
* | fix issue with abconfig when cloning a channelMario2020-12-152-7/+21
| |
* | use refresh_all in mod importMario2020-12-151-1/+1
| |
* | owa: dismiss deleted hublocsMario2020-12-151-6/+6
| |
* | try to fix more hubloc anomalies: use refresh_all in ↵Mario2020-12-152-43/+45
| | | | | | | | remove_obsolete_hublocs() and use Libzot::encode_locations() instead of zot_encode_locations() in notifier
* | fix file sync issuesMario2020-12-142-3/+6
| |
* | handle removal of terms in attach_delete() when deleting a ressourceMario2020-12-142-11/+8
| |
* | sync categoriesMario2020-12-142-2/+31
| |
* | improve when to show link to parent pathMario2020-12-141-6/+4
| |
* | fix missing hubloc_id_url for zot hubloc when importing a channelMario2020-12-141-3/+4
| |
* | add another parent element to wrap the toolsMario2020-12-141-39/+45
| |
* | 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
|/ /