Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-12-20 | 3 | -23/+20 |
|\ | | | | | | | | | Use Zot6 for CardDAV and CalDAV sync between clones See merge request hubzilla/core!1886 | ||||
| * | Fix CardDAV address book ID | Max Kostikov | 2020-12-19 | 1 | -0/+1 |
| | | |||||
| * | Use Zot6 for CardDAV and CalDAV sync between clones | Max Kostikov | 2020-12-19 | 1 | -18/+19 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-12-19 | 46 | -1033/+2335 |
| |\ | |/ |/| | | | | | Dev sync See merge request kostikov/core!4 | ||||
* | | refresh_all will be called from the notifier in Daemon/Directory | Mario | 2020-12-19 | 1 | -5/+0 |
| | | |||||
* | | deprecate ! and !! forum tags | Mario | 2020-12-18 | 3 | -11/+16 |
| | | |||||
* | | flag forums where we do not have post permissions and filter them from the ↵ | Mario | 2020-12-18 | 2 | -4/+36 |
| | | | | | | | | acl selector | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2020-12-18 | 1 | -232/+231 |
|\ \ | |||||
| * | | do not json_encode the attach array - fixes #1499 | Mario | 2020-12-17 | 1 | -232/+231 |
| | | | |||||
* | | | handle owa with hubloc_id_url only | Mario Vavti | 2020-12-18 | 2 | -13/+7 |
|/ / | |||||
* | | changelog for version 5.0.6 | Mario | 2020-12-17 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-12-17 | 3 | -4/+38 |
|\ \ | |||||
| * | | update to fix empty hubloc_id_url caused by clone import bug for zot hublocs ↵ | Mario Vavti | 2020-12-17 | 2 | -2/+36 |
| | | | | | | | | | | | | which was fixed in 4693069a0618775167fd5c5b8c91b80f8a832da0 | ||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2020-12-17 | 5 | -57/+92 |
| |\ \ | |||||
| * | | | restrict owa to zot6 and zot network until the hubloc madness with ↵ | Mario Vavti | 2020-12-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | activitypub and possibly also diaspora will be solved | ||||
* | | | | files_ng: provide bbcode snippets in the info panel | Mario | 2020-12-17 | 3 | -6/+48 |
| |/ / |/| | | |||||
* | | | files_ng: fix regression in finding the right path in certain situations and ↵ | Mario | 2020-12-16 | 3 | -25/+55 |
| | | | | | | | | | | | | add a info panel with attach and zrl bbcode | ||||
* | | | files_ng: implement lockview | Mario | 2020-12-16 | 2 | -31/+36 |
| | | | |||||
* | | | fix regression in files aclselect | Mario | 2020-12-15 | 1 | -1/+1 |
|/ / | |||||
* | | fix issue with abconfig when cloning a channel | Mario | 2020-12-15 | 2 | -7/+21 |
| | | |||||
* | | use refresh_all in mod import | Mario | 2020-12-15 | 1 | -1/+1 |
| | | |||||
* | | owa: dismiss deleted hublocs | Mario | 2020-12-15 | 1 | -6/+6 |
| | | |||||
* | | try to fix more hubloc anomalies: use refresh_all in ↵ | Mario | 2020-12-15 | 2 | -43/+45 |
| | | | | | | | | remove_obsolete_hublocs() and use Libzot::encode_locations() instead of zot_encode_locations() in notifier | ||||
* | | fix file sync issues | Mario | 2020-12-14 | 2 | -3/+6 |
| | | |||||
* | | handle removal of terms in attach_delete() when deleting a ressource | Mario | 2020-12-14 | 2 | -11/+8 |
| | | |||||
* | | sync categories | Mario | 2020-12-14 | 2 | -2/+31 |
| | | |||||
* | | improve when to show link to parent path | Mario | 2020-12-14 | 1 | -6/+4 |
| | | |||||
* | | fix missing hubloc_id_url for zot hubloc when importing a channel | Mario | 2020-12-14 | 1 | -3/+4 |
| | | |||||
* | | add another parent element to wrap the tools | Mario | 2020-12-14 | 1 | -39/+45 |
| | | |||||
* | | merge branch files_ng into dev | Mario | 2020-12-14 | 30 | -587/+1684 |
| | | |||||
* | | try to prevent hubloc confusion in some places | Mario | 2020-12-12 | 5 | -48/+59 |
| | | | | | | (cherry picked from commit 61cfeb5bdb749319357912d958cd13304b895bce) | ||||
* | | make gprobe look for zot6 only | Mario | 2020-12-12 | 1 | -1/+1 |
| | | | | | | (cherry picked from commit 1d3437aa419adde319d2a3f5d98e7f8fe4418f27) | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-12-12 | 1 | -5/+0 |
|\ \ | | | | | | | | | | | | | Remove duplicate delete terms query See merge request hubzilla/core!1885 | ||||
| * | | Remove duplicate delete terms query | Max Kostikov | 2020-12-12 | 1 | -5/+0 |
|/ / | |||||
| * | Remove duplicate delete terms query | Max Kostikov | 2020-12-12 | 1 | -5/+0 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-12-12 | 4 | -26/+27 |
| |\ | |/ |/| | | | | | Dev sync See merge request kostikov/core!3 | ||||
* | | fix hubloc issue in mod getfile | Mario | 2020-12-11 | 2 | -12/+13 |
| | | | | | | (cherry picked from commit b0b9b9f28974f9016e47491e81876224c57a7e3b) | ||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-12-07 | 1 | -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 id | Max Kostikov | 2020-12-07 | 1 | -11/+11 |
| | | | |||||
* | | | remove announce activity from response activites array | Mario | 2020-12-07 | 2 | -14/+14 |
|/ / | | | | | (cherry picked from commit 52c78c757ae73082ed29e48707b2313e65020db3) | ||||
| * | Formatting | Max Kostikov | 2020-12-04 | 1 | -9/+9 |
| | | |||||
| * | Skip profile photo query from addons for undefined channel id | Max Kostikov | 2020-12-04 | 1 | -10/+10 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-12-04 | 434 | -8722/+27251 |
| |\ | |/ |/| | | | | | Dev sync See merge request kostikov/core!2 | ||||
* | | changelog | Mario | 2020-12-01 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-12-01 | 1 | -1/+1 |
|\ \ | |||||
| * | | dismiss title in response activity | Mario | 2020-11-28 | 1 | -1/+1 |
| | | | | | | | | | (cherry picked from commit eb2ad3fc438544192cda95d88a4c2a54ec1e0014) | ||||
* | | | missing parenthesis | Mario | 2020-12-01 | 1 | -0/+1 |
| | | | |||||
* | | | Ãfix regerssion in updating the primary | Mario | 2020-12-01 | 1 | -28/+34 |
|/ / | |||||
* | | run composer install --no-dev | Mario | 2020-11-27 | 4 | -3/+35 |
| | | |||||
* | | run composer install --no-dev | Mario | 2020-11-27 | 8 | -12593/+10 |
| | |