Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Legacy Hubzilla compatibility: when we relay a comment from hubzilla < 4.0, ↵ | Mario | 2020-05-11 | 1 | -1/+2 |
| | | | | we send it to ourself again but this time with a valid uri as mid. To catch this as duplicate, we need to check for the basename aswell. | ||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-05-11 | 1 | -0/+13 |
|\ | | | | | | | | | Dev See merge request hubzilla/core!1856 | ||||
| * | issue with quoted hashtags/mentions | zotlabs | 2020-05-10 | 1 | -0/+13 |
| | | |||||
| * | re-apply after removing from cherry-picked git hash from wrong branch | zotlabs | 2020-05-05 | 4 | -5/+32 |
| | | |||||
| * | Revert "issue generating photo thumbnails when uploaded via davfs" | zotlabs | 2020-05-05 | 4 | -32/+5 |
| | | | | | | | | This reverts commit 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4. | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-05-05 | 49 | -268/+1497 |
| |\ | |||||
| * | | issue generating photo thumbnails when uploaded via davfs | zotlabs | 2020-05-05 | 4 | -5/+32 |
| | | | |||||
* | | | deal with diaspora uuid | Mario | 2020-05-10 | 1 | -5/+3 |
| | | | |||||
* | | | as_vid_sort -> vid_sort | Mario | 2020-05-10 | 1 | -2/+2 |
| | | | |||||
* | | | it looks like this was required at some point but is not required anymore ↵ | Mario | 2020-05-08 | 1 | -4/+4 |
| | | | | | | | | | | | | for our autocomplete to work as expected. fixes #1463 | ||||
* | | | new files | Mario | 2020-05-07 | 17 | -0/+6394 |
| | | | |||||
* | | | composer updates 2 | Mario | 2020-05-07 | 445 | -10236/+4360 |
| | | | |||||
* | | | Revert "composer updates" | Mario | 2020-05-07 | 446 | -5827/+10903 |
| | | | | | | | | | This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00 | ||||
* | | | Revert "add new files" | Mario | 2020-05-07 | 17 | -6394/+0 |
| | | | | | | | | | This reverts commit c76ff4249ec0f88832a9ce6c966a2fd326482197 | ||||
* | | | tests: more declare return type | Mario | 2020-05-07 | 1 | -1/+1 |
| | | | |||||
* | | | tests: declare return type | Mario | 2020-05-07 | 1 | -1/+1 |
| | | | |||||
* | | | bump php version to 7.3 for gitlab-ci | Mario | 2020-05-07 | 1 | -11/+10 |
| | | | |||||
* | | | add new files | Mario | 2020-05-07 | 17 | -0/+6394 |
| | | | |||||
* | | | composer updates | Mario | 2020-05-07 | 446 | -10903/+5827 |
| | | | |||||
* | | | fix tests | Mario | 2020-05-07 | 1 | -1/+0 |
| | | | |||||
* | | | remove more traces of the premium channel app | Mario | 2020-05-07 | 1 | -17/+0 |
| | | | |||||
* | | | deprecate premium channel app | Mario | 2020-05-07 | 4 | -8/+26 |
| | | | |||||
* | | | channelx caching | Mario | 2020-05-07 | 1 | -0/+23 |
| | | | |||||
* | | | css | Mario | 2020-05-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-05-06 | 4 | -5/+32 |
|\ \ \ | |||||
| * \ \ | Merge branch 'dev' into 'dev' | Mario | 2020-05-06 | 4 | -5/+32 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Issue generating photo thumbnails when uploaded via davfs See merge request hubzilla/core!1855 | ||||
| | * | | Revert "issue generating photo thumbnails when uploaded via davfs" | Zot | 2020-05-06 | 4 | -5/+32 |
| |/ / | | | | | | | | | | This reverts commit 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4. | ||||
* / / | allow to set different values for left and right aside width in $theme.php | Mario | 2020-05-06 | 2 | -13/+17 |
|/ / | |||||
* | | deal with polls and votes in enotify | Mario | 2020-05-05 | 3 | -10/+21 |
| | | |||||
* | | catch the owner_xchan for activity_share items in notifications filter | Mario | 2020-05-05 | 1 | -3/+3 |
| | | |||||
* | | typo | Mario | 2020-05-04 | 1 | -1/+1 |
| | | |||||
* | | display complete perminfo only to owner | Mario | 2020-05-04 | 5 | -9/+10 |
| | | |||||
* | | set CURLOPT_ENCODING in z_post_url() | Mario | 2020-05-04 | 1 | -0/+1 |
| | | |||||
* | | version 4.7.6 | Mario | 2020-05-03 | 1 | -1/+1 |
| | | |||||
* | | improve functionality of combined notification filters | Mario | 2020-05-03 | 3 | -9/+20 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-05-02 | 4 | -6/+12 |
|\ \ | | | | | | | | | | | | | Display delayed posts on author's channel page See merge request hubzilla/core!1854 | ||||
| * | | Display delayed posts on author's channel page | Max Kostikov | 2020-05-02 | 4 | -6/+12 |
| | | | |||||
* | | | Merge branch 'iss1457' into 'dev' | Mario | 2020-05-02 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | stress the importance of PHP mail() See merge request hubzilla/core!1852 | ||||
| * | | | stress the importance of PHP mail() | OJ Random | 2020-04-27 | 1 | -1/+2 |
| | | | | |||||
* | | | | missing lib include | Mario | 2020-05-02 | 1 | -0/+2 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-05-01 | 1 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-04-29 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Force browser photo revalidation See merge request hubzilla/core!1853 | ||||
| | * | | | Force browser photo revalidation | Max Kostikov | 2020-04-29 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Update Item.php | Max Kostikov | 2020-04-12 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Remove unnecessary [summary] tag processing | Max Kostikov | 2020-04-12 | 1 | -11/+11 |
| | | | | | |||||
* | | | | | set CURLOPT_ENCODING to empty string so that compressed content will be ↵ | Mario | 2020-05-01 | 1 | -1/+2 |
|/ / / / | | | | | | | | | | | | | uncompressed | ||||
* | | | | Ãfix photo items | Mario | 2020-04-29 | 1 | -5/+3 |
| | | | | |||||
* | | | | adjust code comments and whitespace | Mario | 2020-04-29 | 1 | -3/+4 |
| | | | | |||||
* | | | | more work on attach_store_item() | Mario | 2020-04-29 | 1 | -2/+60 |
| |/ / |/| | | |||||
* | | | fix mod filestorage and fetch the info from attach if only the hash is ↵ | Mario | 2020-04-25 | 2 | -4/+18 |
| | | | | | | | | | | | | provided in attach_store_item() |