aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-06-152-11/+8
|\
| * zot6 does not appear to use zfingerMario Vavti2020-06-142-11/+8
| |
* | new fileMario2020-06-151-0/+91
| |
* | composer update commerceguys/intlMario2020-06-15347-62346/+155
|/
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2020-06-14377-8243/+8431
|\
| * check for zot6 firstMario2020-06-141-23/+25
| |
| * composer update jquery-file-uploadMario2020-06-1318-378/+479
| |
| * update jquery to version 3.5.1Mario2020-06-131-2/+3
| |
| * revert additional top borderMario2020-06-131-1/+1
| |
| * css fixes due to bootstrap updateMario2020-06-133-21/+10
| |
| * composer update bootstrapMario2020-06-13356-7819/+7914
| |
* | fix discoveryMario Vavti2020-06-143-12/+14
|/
* Merge branch 'dev' into 'dev'Mario2020-06-114-14/+8
|\ | | | | | | | | allow apps to be both pinned and starred independently See merge request hubzilla/core!1858
| * allow apps to be both pinned and starred independentlyZot2020-06-114-14/+8
|/
* Merge branch 'fix-invite-code-deletion' into 'dev'Mario2020-06-011-1/+1
|\ | | | | | | | | Fix invite code deletion See merge request hubzilla/core!1857
| * Fix bug allowing invite codes to be reused unlimited timesKeenan Pepper2020-05-271-1/+1
|/ | | | The invite codes aren't deleted from the DB because of a malformed query.
* use strip_tags() on rss titlesMario2020-05-181-0/+1
|
* comment out code which is only required for loggingÃMario2020-05-181-1/+1
|
* re-enable time loggingMario2020-05-181-1/+1
|
* bump versionMario2020-05-181-1/+1
|
* add images load status to spinnner if preload images is enabledMario2020-05-182-29/+45
|
* wrong pathMario2020-05-161-1/+1
|
* uuid for likesMario Vavti2020-05-151-0/+3
|
* Revert "uuid for likes"Mario2020-05-151-3/+0
| | | | This reverts commit b6efb02ed291fcdfb32e8587a031950d752327bc.
* uuid for likesMario2020-05-151-0/+3
|
* whitespaceMario2020-05-151-5/+5
|
* rewriting the author for legacy compatibility only if author is from this ↵Mario2020-05-151-2/+6
| | | | site and add comment.
* rewriting the owner for legacy compatibility should be sufficientMario2020-05-151-4/+2
|
* use zot_record_preferred() when fetching keysMario2020-05-152-10/+17
|
* implement notifications for direct messagesMario2020-05-143-4/+95
|
* use dbq() in update 1238Mario2020-05-121-3/+3
|
* bump versionMario2020-05-121-1/+1
|
* really fix update for postgresMario2020-05-121-7/+19
|
* fix update for postgresMario2020-05-121-5/+5
|
* update fileMario2020-05-121-0/+41
|
* DB update 1238 to fix hubloc_id_url for existing hublocs and set ↵Mario2020-05-122-2/+3
| | | | hubloc_id_url in Activity::actor_store()
* 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