Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | I wonder how long zot_finger() has been missing and how this may have ↵ | zotlabs | 2019-06-28 | 1 | -1/+1 |
| | | | | affected the directory servers. | ||||
* | minor fix | zotlabs | 2019-06-28 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-06-28 | 5 | -11/+8 |
|\ | |||||
| * | decode encoded mid | Mario Vavti | 2019-06-28 | 1 | -2/+1 |
| | | |||||
| * | missing class import | Mario Vavti | 2019-06-28 | 1 | -0/+1 |
| | | |||||
| * | regenerate autoload cache | Mario Vavti | 2019-06-28 | 2 | -2/+0 |
| | | |||||
| * | support zot and zot6 in social graph operations (suggestions, common friends) | zotlabs | 2019-06-28 | 2 | -538/+19 |
| | | | | | | (cherry picked from commit 9def9a5cb7ab7799911013580c714605e9698122) | ||||
| * | photo objects: incorrect media type on links | zotlabs | 2019-06-28 | 1 | -4/+4 |
| | | | | | | (cherry picked from commit 60c003733e7fed70f28eadaf3d9abcf16ec3a8ab) | ||||
| * | extend definition of direct message to anything with allow_cid but *not* ↵ | zotlabs | 2019-06-28 | 1 | -1/+6 |
| | | | | | | | | | | allow_gid. (cherry picked from commit 96a99935ef4f2da899275166b127537287966dac) | ||||
| * | fix typo | Mario Vavti | 2019-06-27 | 1 | -1/+1 |
| | | |||||
| * | do not check send_stream permission for comments | Mario Vavti | 2019-06-27 | 1 | -7/+6 |
| | | |||||
| * | Merge branch 'httpsig' into 'dev' | Mario | 2019-06-27 | 22 | -177/+296 |
| |\ | | | | | | | | | | | | | http signature consolidation See merge request hubzilla/core!1685 | ||||
* | | | begin directory migration to zot6, see the code comments | zotlabs | 2019-06-28 | 1 | -0/+26 |
| | | | |||||
* | | | extend definition of direct message to anything with allow_cid but *not* ↵ | zotlabs | 2019-06-27 | 1 | -1/+6 |
| | | | | | | | | | | | | allow_gid. | ||||
* | | | photo objects: incorrect media type on links | zotlabs | 2019-06-27 | 1 | -4/+4 |
| | | | |||||
* | | | support zot and zot6 in social graph operations (suggestions, common friends) | zotlabs | 2019-06-27 | 2 | -538/+19 |
| | | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-06-26 | 53 | -32045/+16193 |
|\| | | |/ |/| | |||||
| * | port some functions from osada | Mario Vavti | 2019-06-26 | 1 | -15/+272 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-06-26 | 2 | -1/+24 |
| |\ | | | | | | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684 | ||||
| * \ | Merge branch 'fix-item_export-api-path' into 'dev' | Mario | 2019-06-26 | 1 | -2/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Make export_page API endpoint match ZAP See merge request hubzilla/core!1683 | ||||
| | * | | Make export_page API endpoint match ZAP | DM42.Net (Matt Dent) | 2019-06-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'export_items-export_all' into 'dev' | Mario | 2019-06-26 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Export items export all See merge request hubzilla/core!1680 | ||||
| | * | | | export all items except photos | DM42.Net (Matt Dent) | 2019-06-21 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-21 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Fix thumbnails processing logic on files sync See merge request hubzilla/core!1682 | ||||
| | * | | Fix thumbnails processing logic on files sync | Max Kostikov | 2019-06-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | Revert "Respect photo thumbnails storage in import" | Max Kostikov | 2019-06-21 | 1 | -3/+5 |
| | | | | | | | | | | | | This reverts commit e8918ca149f9eb0ea4148431772b9e5090f3ea7f | ||||
| | * | | Respect photo thumbnails storage in import | Max Kostikov | 2019-06-21 | 1 | -5/+3 |
| | | | | |||||
| * | | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue ↵ | Mario Vavti | 2019-06-21 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | with mid's that contain single quotes | ||||
| * | | | apply calendar encoding fixes to mod cal | Mario Vavti | 2019-06-20 | 1 | -3/+3 |
| | | | | |||||
| * | | | fix encoding also for description and location | Mario Vavti | 2019-06-20 | 1 | -3/+3 |
| | | | | |||||
| * | | | various calendar UI improvements: make day- and weeknumbers clickable for ↵ | Mario Vavti | 2019-06-20 | 1 | -8/+31 |
| | | | | | | | | | | | | | | | | | | | | | | | | navigation, hide start and end time fields in month view (only allday events can be generated there), remove the action arg from changeView(). ; | ||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-20 | 9 | -21/+32 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | changes to support direct messages in zot6 (set item.item_private = 2 when... See merge request hubzilla/core!1679 | ||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-19 | 1 | -0/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Remove cached photo location directory on delete if empty See merge request hubzilla/core!1678 | ||||
| | * | | | Remove cached photo location directory on delete if empty | Max Kostikov | 2019-06-19 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Use html_entity_decode() for cached photo URL See merge request hubzilla/core!1677 | ||||
| | * | | | Use html_entity_decode() for cached photo URL | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Include Zot6 hubs in the Grid scope See merge request hubzilla/core!1676 | ||||
| | * | | | Update zid.php | Max Kostikov | 2019-06-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Include Zot6 hubs in the Grid scope | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-18 | 4 | -13843/+15287 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Update German and Russian translations See merge request hubzilla/core!1674 | ||||
| | * | | | Update hstrings.php | Max Kostikov | 2019-06-18 | 1 | -13/+14 |
| | | | | | |||||
| | * | | | Update hmessages.po | Max Kostikov | 2019-06-18 | 1 | -551/+553 |
| | | | | | |||||
| | * | | | Update hstrings.php | Max Kostikov | 2019-06-18 | 1 | -2566/+2805 |
| | | | | | |||||
| | * | | | Update hmessages.po | Max Kostikov | 2019-06-18 | 1 | -10713/+11915 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Fix os_path replace for thumbnails See merge request hubzilla/core!1672 | ||||
| | * | | | Fix os_path replace for thumbnails | Max Kostikov | 2019-06-18 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-18 | 33 | -18085/+407 |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Dev See merge request kostikov/core!1 | ||||
| * | | | | Avoid to process original images using storeThumbnail | Max Kostikov | 2019-06-18 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-18 | 3 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | minor zot6 compatibility issues uncovered through daily use See merge request hubzilla/core!1671 | ||||
| * | | | | | fix typo | Mario Vavti | 2019-06-18 | 1 | -2/+2 |
| | | | | | |