Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | composer update html-to-markdown | Mario Vavti | 2020-08-22 | 8 | -15/+89 |
| | |||||
* | composer update htmlpurifier | Mario Vavti | 2020-08-22 | 74 | -8938/+62 |
| | |||||
* | bootstrap files | Mario Vavti | 2020-08-22 | 7 | -0/+282 |
| | |||||
* | composer update bootstrap | Mario Vavti | 2020-08-22 | 128 | -2900/+2194 |
| | |||||
* | composer update jquery-file-upload | Mario Vavti | 2020-08-22 | 6 | -711/+448 |
| | |||||
* | composer update sabre libs | Mario Vavti | 2020-08-22 | 25 | -124/+180 |
| | |||||
* | use the default setting and also add the mode to the cipher. aes-128 is to ↵ | Mario Vavti | 2020-08-21 | 5 | -8/+8 |
| | | | | be preferred over aes-256 according to bruce schneier https://www.schneier.com/blog/archives/2009/07/another_new_aes.html#c386957 | ||||
* | whitespace | Mario Vavti | 2020-08-20 | 1 | -1/+0 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2020-08-20 | 1 | -1/+1 |
|\ | |||||
| * | be more clear in comment | Mario | 2020-08-20 | 1 | -1/+1 |
| | | |||||
* | | 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 |
| |/ |/| |