aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Legacy Hubzilla compatibility: when we relay a comment from hubzilla < 4.0, ↵Mario2020-05-111-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'Mario2020-05-111-0/+13
|\ | | | | | | | | Dev See merge request hubzilla/core!1856
| * issue with quoted hashtags/mentionszotlabs2020-05-101-0/+13
| |
| * re-apply after removing from cherry-picked git hash from wrong branchzotlabs2020-05-054-5/+32
| |
| * Revert "issue generating photo thumbnails when uploaded via davfs"zotlabs2020-05-054-32/+5
| | | | | | | | This reverts commit 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4.
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-05-0549-268/+1497
| |\
| * | issue generating photo thumbnails when uploaded via davfszotlabs2020-05-054-5/+32
| | |
* | | deal with diaspora uuidMario2020-05-101-5/+3
| | |
* | | as_vid_sort -> vid_sortMario2020-05-101-2/+2
| | |
* | | it looks like this was required at some point but is not required anymore ↵Mario2020-05-081-4/+4
| | | | | | | | | | | | for our autocomplete to work as expected. fixes #1463
* | | new filesMario2020-05-0717-0/+6394
| | |
* | | composer updates 2Mario2020-05-07445-10236/+4360
| | |
* | | Revert "composer updates"Mario2020-05-07446-5827/+10903
| | | | | | | | | This reverts commit dbfe748d274f6843fc91a3071df7be45c4ab5b00
* | | Revert "add new files"Mario2020-05-0717-6394/+0
| | | | | | | | | This reverts commit c76ff4249ec0f88832a9ce6c966a2fd326482197
* | | tests: more declare return typeMario2020-05-071-1/+1
| | |
* | | tests: declare return typeMario2020-05-071-1/+1
| | |
* | | bump php version to 7.3 for gitlab-ciMario2020-05-071-11/+10
| | |
* | | add new filesMario2020-05-0717-0/+6394
| | |
* | | composer updatesMario2020-05-07446-10903/+5827
| | |
* | | fix testsMario2020-05-071-1/+0
| | |
* | | remove more traces of the premium channel appMario2020-05-071-17/+0
| | |
* | | deprecate premium channel appMario2020-05-074-8/+26
| | |
* | | channelx cachingMario2020-05-071-0/+23
| | |
* | | cssMario2020-05-061-1/+1
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-05-064-5/+32
|\ \ \
| * \ \ Merge branch 'dev' into 'dev'Mario2020-05-064-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"Zot2020-05-064-5/+32
| |/ / | | | | | | | | | This reverts commit 7a0d9a449492ff3b5ef97b997310ed26ec1f53e4.
* / / allow to set different values for left and right aside width in $theme.phpMario2020-05-062-13/+17
|/ /
* | deal with polls and votes in enotifyMario2020-05-053-10/+21
| |
* | catch the owner_xchan for activity_share items in notifications filterMario2020-05-051-3/+3
| |
* | typoMario2020-05-041-1/+1
| |
* | display complete perminfo only to ownerMario2020-05-045-9/+10
| |
* | set CURLOPT_ENCODING in z_post_url()Mario2020-05-041-0/+1
| |
* | version 4.7.6Mario2020-05-031-1/+1
| |
* | improve functionality of combined notification filtersMario2020-05-033-9/+20
| |
* | Merge branch 'dev' into 'dev'Mario2020-05-024-6/+12
|\ \ | | | | | | | | | | | | Display delayed posts on author's channel page See merge request hubzilla/core!1854
| * | Display delayed posts on author's channel pageMax Kostikov2020-05-024-6/+12
| | |
* | | Merge branch 'iss1457' into 'dev'Mario2020-05-021-1/+2
|\ \ \ | | | | | | | | | | | | | | | | stress the importance of PHP mail() See merge request hubzilla/core!1852
| * | | stress the importance of PHP mail()OJ Random2020-04-271-1/+2
| | | |
* | | | missing lib includeMario2020-05-021-0/+2
| | | |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-05-011-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'dev' into 'dev'Max Kostikov2020-04-291-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Force browser photo revalidation See merge request hubzilla/core!1853
| | * | | Force browser photo revalidationMax Kostikov2020-04-291-2/+2
| | | | |
| | * | | Update Item.phpMax Kostikov2020-04-121-3/+3
| | | | |
| | * | | Remove unnecessary [summary] tag processingMax Kostikov2020-04-121-11/+11
| | | | |
* | | | | set CURLOPT_ENCODING to empty string so that compressed content will be ↵Mario2020-05-011-1/+2
|/ / / / | | | | | | | | | | | | uncompressed
* | | | Ãfix photo itemsMario2020-04-291-5/+3
| | | |
* | | | adjust code comments and whitespaceMario2020-04-291-3/+4
| | | |
* | | | more work on attach_store_item()Mario2020-04-291-2/+60
| |/ / |/| |
* | | fix mod filestorage and fetch the info from attach if only the hash is ↵Mario2020-04-252-4/+18
| | | | | | | | | | | | provided in attach_store_item()