Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | zot6 does not appear to use zfinger | Mario Vavti | 2020-06-14 | 2 | -11/+8 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2020-06-14 | 377 | -8243/+8431 |
|\ | |||||
| * | check for zot6 first | Mario | 2020-06-14 | 1 | -23/+25 |
| | | |||||
| * | composer update jquery-file-upload | Mario | 2020-06-13 | 18 | -378/+479 |
| | | |||||
| * | update jquery to version 3.5.1 | Mario | 2020-06-13 | 1 | -2/+3 |
| | | |||||
| * | revert additional top border | Mario | 2020-06-13 | 1 | -1/+1 |
| | | |||||
| * | css fixes due to bootstrap update | Mario | 2020-06-13 | 3 | -21/+10 |
| | | |||||
| * | composer update bootstrap | Mario | 2020-06-13 | 356 | -7819/+7914 |
| | | |||||
* | | fix discovery | Mario Vavti | 2020-06-14 | 3 | -12/+14 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-06-11 | 4 | -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 independently | Zot | 2020-06-11 | 4 | -14/+8 |
|/ | |||||
* | Merge branch 'fix-invite-code-deletion' into 'dev' | Mario | 2020-06-01 | 1 | -1/+1 |
|\ | | | | | | | | | Fix invite code deletion See merge request hubzilla/core!1857 | ||||
| * | Fix bug allowing invite codes to be reused unlimited times | Keenan Pepper | 2020-05-27 | 1 | -1/+1 |
|/ | | | | The invite codes aren't deleted from the DB because of a malformed query. | ||||
* | use strip_tags() on rss titles | Mario | 2020-05-18 | 1 | -0/+1 |
| | |||||
* | comment out code which is only required for loggingà | Mario | 2020-05-18 | 1 | -1/+1 |
| | |||||
* | re-enable time logging | Mario | 2020-05-18 | 1 | -1/+1 |
| | |||||
* | bump version | Mario | 2020-05-18 | 1 | -1/+1 |
| | |||||
* | add images load status to spinnner if preload images is enabled | Mario | 2020-05-18 | 2 | -29/+45 |
| | |||||
* | wrong path | Mario | 2020-05-16 | 1 | -1/+1 |
| | |||||
* | uuid for likes | Mario Vavti | 2020-05-15 | 1 | -0/+3 |
| | |||||
* | Revert "uuid for likes" | Mario | 2020-05-15 | 1 | -3/+0 |
| | | | | This reverts commit b6efb02ed291fcdfb32e8587a031950d752327bc. | ||||
* | uuid for likes | Mario | 2020-05-15 | 1 | -0/+3 |
| | |||||
* | whitespace | Mario | 2020-05-15 | 1 | -5/+5 |
| | |||||
* | rewriting the author for legacy compatibility only if author is from this ↵ | Mario | 2020-05-15 | 1 | -2/+6 |
| | | | | site and add comment. | ||||
* | rewriting the owner for legacy compatibility should be sufficient | Mario | 2020-05-15 | 1 | -4/+2 |
| | |||||
* | use zot_record_preferred() when fetching keys | Mario | 2020-05-15 | 2 | -10/+17 |
| | |||||
* | implement notifications for direct messages | Mario | 2020-05-14 | 3 | -4/+95 |
| | |||||
* | use dbq() in update 1238 | Mario | 2020-05-12 | 1 | -3/+3 |
| | |||||
* | bump version | Mario | 2020-05-12 | 1 | -1/+1 |
| | |||||
* | really fix update for postgres | Mario | 2020-05-12 | 1 | -7/+19 |
| | |||||
* | fix update for postgres | Mario | 2020-05-12 | 1 | -5/+5 |
| | |||||
* | update file | Mario | 2020-05-12 | 1 | -0/+41 |
| | |||||
* | DB update 1238 to fix hubloc_id_url for existing hublocs and set ↵ | Mario | 2020-05-12 | 2 | -2/+3 |
| | | | | hubloc_id_url in Activity::actor_store() | ||||
* | 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 |
| | | |