Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | stringify_array_elms() could return weird results if the initial array key ↵ | Mario Vavti | 2019-07-15 | 1 | -2/+2 |
| | | | | was not zero. this could trigger obscure bugs e.g. adding an empty string value to the recipients array in the notifier which could then select some broken hubloc/xchan entries. | ||||
* | Merge branch 'serve-static-files' into 'dev' | Mario | 2019-07-15 | 1 | -0/+45 |
|\ | | | | | | | | | Serve static files directly if not caught by web server See merge request hubzilla/core!1691 | ||||
| * | Serve static files directly if not caught by web server | DM42.Net (Matt Dent) | 2019-07-14 | 1 | -0/+45 |
| | | |||||
* | | Merge branch 'queueworker-updates' into 'dev' | Mario | 2019-07-15 | 1 | -1/+17 |
|\ \ | |/ |/| | | | | | Hookify Zotlabs\Daemon\Master::Summon See merge request hubzilla/core!1692 | ||||
| * | Hookify Zotlabs\Daemon\Master::Summon | DM42.Net (Matt Dent) | 2019-07-15 | 1 | -1/+17 |
|/ | |||||
* | update certs | Mario Vavti | 2019-07-13 | 1 | -261/+335 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-07-13 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-13 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | Missprint in Russian translation fixed See merge request hubzilla/core!1690 | ||||
| | * | Missprint fixed | Max Kostikov | 2019-07-13 | 1 | -1/+1 |
| | | | |||||
| | * | Missprint fixed | Max Kostikov | 2019-07-13 | 1 | -1/+1 |
| | | | |||||
* | | | admin should be allowed to delete any item | Mario Vavti | 2019-07-13 | 1 | -5/+4 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-07-12 | 2 | -1/+14 |
|\ \ | | | | | | | | | | | | | emoji reactions from hubzilla becoming top level posts on zap because of missing object See merge request hubzilla/core!1689 | ||||
| * | | emoji reactions from hubzilla becoming top level posts on zap because of ↵ | zotlabs | 2019-07-11 | 2 | -1/+14 |
| | | | | | | | | | | | | missing object | ||||
* | | | webfinger: better handling of URLs that contain a @ | Mario Vavti | 2019-07-12 | 1 | -5/+6 |
| | | | |||||
* | | | calendar: revert back to UTC strings for dates due to better legibility. ↵ | Mario Vavti | 2019-07-11 | 3 | -30/+30 |
| | | | | | | | | | | | | Strip timezone info from UTC string and always treat values as UTC. | ||||
* | | | calendar: display date values as ISO string | Mario Vavti | 2019-07-09 | 1 | -19/+19 |
| | | | |||||
* | | | hide timezone select on allday events | Mario Vavti | 2019-07-08 | 2 | -4/+20 |
| | | | |||||
* | | | fix typo | Mario Vavti | 2019-07-03 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-07-02 | 4 | -8/+45 |
|\| | | | | | | | | | | | | | | begin directory migration to zot6, see the code comments See merge request hubzilla/core!1687 | ||||
| * | | I'm pretty sure the LD construct 'diaspora:guid' isn't actually legal ↵ | zotlabs | 2019-07-01 | 2 | -2/+5 |
| | | | | | | | | | | | | without a definition of 'diaspora' in the current or parent LD context. | ||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-07-01 | 1 | -1/+1 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-01 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Fix missprint in German translation See merge request hubzilla/core!1688 | ||||
| * | | Update hstrings.php | Max Kostikov | 2019-07-01 | 1 | -1/+1 |
| | | | |||||
| | * | add opengraph meta info to channel page | zotlabs | 2019-06-29 | 1 | -0/+11 |
| | | | |||||
| | * | zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted ↵ | zotlabs | 2019-06-28 | 1 | -5/+2 |
| | | | | | | | | | | | | accordingly. | ||||
| | * | 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 |
| | | | |