Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | first cut on implementing additional encryption with the SJCL library. aes ↵ | Mario Vavti | 2020-08-20 | 10 | -10/+167 |
| | | | | only and no backward compatibility. | ||||
* | fix item deletion | Mario | 2020-08-20 | 2 | -15/+28 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-08-17 | 1 | -1/+1 |
|\ | | | | | | | | | issue with DAV - moveInto and variable scope See merge request hubzilla/core!1868 | ||||
| * | issue with DAV - moveInto and variable scope | nobody | 2020-08-16 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | nobody | 2020-08-16 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | $id is expected to be an array with a calendarId and an instanceId for caldav | Mario Vavti | 2020-08-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-08-05 | 2 | -16/+0 |
|\ \ | | | | | | | | | | | | | update profile|cover photo activities converted to z6 See merge request hubzilla/core!1865 | ||||
| * | | update profile|cover photo activities converted to z6 | Zot | 2020-08-05 | 2 | -16/+0 |
|/ / | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | nobody | 2020-08-04 | 1 | -1/+1 |
| |\ | |/ |/| | |||||
* | | Ãthis should not be required anymore | Mario | 2020-08-03 | 1 | -1/+1 |
| | | |||||
| * | update profile|cover photo activities converted to z6 | nobody | 2020-08-04 | 2 | -16/+0 |
|/ | |||||
* | css fix | Mario | 2020-07-31 | 1 | -1/+1 |
| | |||||
* | event display zot/zot6 compatibility | Mario | 2020-07-31 | 1 | -51/+51 |
| | |||||
* | syntax | Mario | 2020-07-30 | 1 | -4/+4 |
| | |||||
* | use cursor-pointer for the lock | Mario | 2020-07-30 | 1 | -2/+2 |
| | |||||
* | add new lock icon as svg | Mario | 2020-07-30 | 2 | -2/+45 |
| | |||||
* | use the compact view in html2plain() | Mario | 2020-07-30 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-07-30 | 6 | -3/+18 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2020-07-30 | 1 | -1/+3 |
| |\ | | | | | | | | | | | | | Add minimum form displaying time before login See merge request hubzilla/core!1863 | ||||
| | * | Add minimum form displaying time before login | Max Kostikov | 2020-07-21 | 1 | -1/+3 |
| | | | |||||
| | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-07-19 | 906 | -79470/+37883 |
| | |\ | | | | | | | | | | | | | | | | | Dev sync See merge request kostikov/core!1 | ||||
| * | \ | Merge branch 'dev' into 'dev' | Mario | 2020-07-30 | 5 | -2/+15 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | foreach warning and a minor update to util/zotsh See merge request hubzilla/core!1864 | ||||
| | * | | | add api_verify to api_zot | zotlabs | 2020-07-22 | 1 | -1/+14 |
| | | | | | |||||
| | * | | | foreach warning | zotlabs | 2020-07-22 | 4 | -1/+1 |
| | | | | | |||||
* | | | | | respect notifications settings | Mario | 2020-07-30 | 1 | -1/+34 |
|/ / / / | |||||
* | | | | raise cache lifetime - this should probably be configurable | Mario | 2020-07-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | add some context to the notifications | Mario | 2020-07-29 | 3 | -13/+11 |
| | | | | |||||
* | | | | version | Mario | 2020-07-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | whitespace | Mario | 2020-07-26 | 2 | -2/+2 |
| | | | | |||||
* | | | | fix hubloc_id_url for activitypub with broken xchan_url | Mario | 2020-07-26 | 2 | -13/+44 |
| | | | | |||||
* | | | | version | Mario | 2020-07-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | improve profile detection and reduce feed result set | Mario | 2020-07-26 | 2 | -5/+30 |
| | | | | |||||
* | | | | tool to fix missing hubloc_id_url entries | Mario | 2020-07-24 | 1 | -0/+41 |
| | | | | |||||
* | | | | construct hubloc_id_url for imported legacy zot hublocs | Mario | 2020-07-24 | 1 | -1/+4 |
|/ / / | |||||
* | | | reset bParam_page in case of failure | Mario | 2020-07-21 | 1 | -0/+1 |
| | | | |||||
* | | | Revert "zot6 testing" | Mario | 2020-07-21 | 1 | -2/+1 |
| | | | | | | | | | | | | This reverts commit 4f95b44ff239f92574491b3053b7f5aace6432d3. | ||||
* | | | those are not lÃikely to be parents | Mario | 2020-07-21 | 1 | -2/+2 |
| | | | |||||
* | | | zot6 testing | Mario | 2020-07-21 | 1 | -1/+2 |
| | | | |||||
* | | | slightly raise cache lifetime | Mario | 2020-07-21 | 1 | -1/+1 |
| | | | |||||
* | | | no need to iterate the object twice | Mario | 2020-07-21 | 1 | -61/+56 |
| |/ |/| | |||||
* | | do not cache single thread pages | Mario | 2020-07-16 | 1 | -29/+2 |
| | | |||||
* | | more itemspage work | Mario | 2020-07-16 | 2 | -5/+33 |
| | | |||||
* | | version | Mario | 2020-07-16 | 1 | -1/+1 |
| | | |||||
* | | an attempt to improve lazy loading | Mario | 2020-07-16 | 1 | -7/+79 |
| | | |||||
* | | bump zot revision to 6.0 std version to 4.7.9 | Mario | 2020-07-14 | 1 | -2/+2 |
| | | |||||
* | | minor adjustion | Mario | 2020-07-14 | 2 | -1/+2 |
| | | |||||
* | | reduce result sets and work around a regression in justifiedGallery | Mario | 2020-07-14 | 16 | -18/+18 |
| | | |||||
* | | prefer zot6 sys channel | Mario | 2020-07-14 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-07-14 | 3 | -23/+59 |
|\ \ | | | | | | | | | | | | | z6 work See merge request hubzilla/core!1862 | ||||
| * | | z6trans: don't swap xprof xchans on directory servers because it will fail ↵ | zotlabs | 2020-07-12 | 1 | -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. |