aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* first cut on implementing additional encryption with the SJCL library. aes ↵Mario Vavti2020-08-2010-10/+167
| | | | only and no backward compatibility.
* fix item deletionMario2020-08-202-15/+28
|
* Merge branch 'dev' into 'dev'Mario2020-08-171-1/+1
|\ | | | | | | | | issue with DAV - moveInto and variable scope See merge request hubzilla/core!1868
| * issue with DAV - moveInto and variable scopenobody2020-08-161-1/+1
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devnobody2020-08-161-1/+1
| |\ | |/ |/|
* | $id is expected to be an array with a calendarId and an instanceId for caldavMario Vavti2020-08-151-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2020-08-052-16/+0
|\ \ | | | | | | | | | | | | update profile|cover photo activities converted to z6 See merge request hubzilla/core!1865
| * | update profile|cover photo activities converted to z6Zot2020-08-052-16/+0
|/ /
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devnobody2020-08-041-1/+1
| |\ | |/ |/|
* | Ãthis should not be required anymoreMario2020-08-031-1/+1
| |
| * update profile|cover photo activities converted to z6nobody2020-08-042-16/+0
|/
* css fixMario2020-07-311-1/+1
|
* event display zot/zot6 compatibilityMario2020-07-311-51/+51
|
* syntaxMario2020-07-301-4/+4
|
* use cursor-pointer for the lockMario2020-07-301-2/+2
|
* add new lock icon as svgMario2020-07-302-2/+45
|
* use the compact view in html2plain()Mario2020-07-301-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-07-306-3/+18
|\
| * Merge branch 'dev' into 'dev'Mario2020-07-301-1/+3
| |\ | | | | | | | | | | | | Add minimum form displaying time before login See merge request hubzilla/core!1863
| | * Add minimum form displaying time before loginMax Kostikov2020-07-211-1/+3
| | |
| | * Merge branch 'dev' into 'dev'Max Kostikov2020-07-19906-79470/+37883
| | |\ | | | | | | | | | | | | | | | | Dev sync See merge request kostikov/core!1
| * | \ Merge branch 'dev' into 'dev'Mario2020-07-305-2/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | foreach warning and a minor update to util/zotsh See merge request hubzilla/core!1864
| | * | | add api_verify to api_zotzotlabs2020-07-221-1/+14
| | | | |
| | * | | foreach warningzotlabs2020-07-224-1/+1
| | | | |
* | | | | respect notifications settingsMario2020-07-301-1/+34
|/ / / /
* | | | raise cache lifetime - this should probably be configurableMario2020-07-301-1/+1
| | | |
* | | | add some context to the notificationsMario2020-07-293-13/+11
| | | |
* | | | versionMario2020-07-261-1/+1
| | | |
* | | | whitespaceMario2020-07-262-2/+2
| | | |
* | | | fix hubloc_id_url for activitypub with broken xchan_urlMario2020-07-262-13/+44
| | | |
* | | | versionMario2020-07-261-1/+1
| | | |
* | | | improve profile detection and reduce feed result setMario2020-07-262-5/+30
| | | |
* | | | tool to fix missing hubloc_id_url entriesMario2020-07-241-0/+41
| | | |
* | | | construct hubloc_id_url for imported legacy zot hublocsMario2020-07-241-1/+4
|/ / /
* | | reset bParam_page in case of failureMario2020-07-211-0/+1
| | |
* | | Revert "zot6 testing"Mario2020-07-211-2/+1
| | | | | | | | | | | | This reverts commit 4f95b44ff239f92574491b3053b7f5aace6432d3.
* | | those are not lÃikely to be parentsMario2020-07-211-2/+2
| | |
* | | zot6 testingMario2020-07-211-1/+2
| | |
* | | slightly raise cache lifetimeMario2020-07-211-1/+1
| | |
* | | no need to iterate the object twiceMario2020-07-211-61/+56
| |/ |/|
* | do not cache single thread pagesMario2020-07-161-29/+2
| |
* | more itemspage workMario2020-07-162-5/+33
| |
* | versionMario2020-07-161-1/+1
| |
* | an attempt to improve lazy loadingMario2020-07-161-7/+79
| |
* | bump zot revision to 6.0 std version to 4.7.9Mario2020-07-141-2/+2
| |
* | minor adjustionMario2020-07-142-1/+2
| |
* | reduce result sets and work around a regression in justifiedGalleryMario2020-07-1416-18/+18
| |
* | prefer zot6 sys channelMario2020-07-141-2/+2
| |
* | Merge branch 'dev' into 'dev'Mario2020-07-143-23/+59
|\ \ | | | | | | | | | | | | z6 work See merge request hubzilla/core!1862
| * | z6trans: don't swap xprof xchans on directory servers because it will fail ↵zotlabs2020-07-121-1/+1
| | | | | | | | | | | | with duplicate primary key in many cases and the migration will fail on each channel. What this means is that directory servers may take time to pick up zot6 entries if they haven't received them prior to the upgrade. I don't see an easier solution unless we check for existence of the zot6 xchan_hash in the xprof table before converting it.