aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-07-164-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude trailing punctuations from URL See merge request hubzilla/core!1694
| * | | | | | | | | Exclude trailing punctuations from URLMax Kostikov2019-07-164-6/+6
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-07-151-1/+1
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-07-151-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ETag quotes See merge request hubzilla/core!1693
| | * | | | | | | | | Fix ETag quotesMax Kostikov2019-07-151-1/+1
| | | | | | | | | | |
* | | | | | | | | | | stringify_array_elms() could return weird results if the initial array key ↵Mario Vavti2019-07-151-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'Mario2019-07-151-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 serverDM42.Net (Matt Dent)2019-07-141-0/+45
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'queueworker-updates' into 'dev'Mario2019-07-151-1/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hookify Zotlabs\Daemon\Master::Summon See merge request hubzilla/core!1692
| * | | | | | | | | | Hookify Zotlabs\Daemon\Master::SummonDM42.Net (Matt Dent)2019-07-151-1/+17
|/ / / / / / / / / /
* | | | | | | | | | update certsMario Vavti2019-07-131-261/+335
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-07-132-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-07-132-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missprint in Russian translation fixed See merge request hubzilla/core!1690
| | * | | | | | | | | Missprint fixedMax Kostikov2019-07-131-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Missprint fixedMax Kostikov2019-07-131-1/+1
| | | | | | | | | | |
* | | | | | | | | | | admin should be allowed to delete any itemMario Vavti2019-07-131-5/+4
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-07-122-1/+14
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emoji reactions from hubzilla becoming top level posts on zap because of missing object See merge request hubzilla/core!1689
* | | | | | | | | | | webfinger: better handling of URLs that contain a @Mario Vavti2019-07-121-5/+6
| | | | | | | | | | |
* | | | | | | | | | | calendar: revert back to UTC strings for dates due to better legibility. ↵Mario Vavti2019-07-113-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip timezone info from UTC string and always treat values as UTC.
* | | | | | | | | | | calendar: display date values as ISO stringMario Vavti2019-07-091-19/+19
| | | | | | | | | | |
* | | | | | | | | | | hide timezone select on allday eventsMario Vavti2019-07-082-4/+20
| | | | | | | | | | |
* | | | | | | | | | | fix typoMario Vavti2019-07-031-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-07-024-8/+45
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | begin directory migration to zot6, see the code comments See merge request hubzilla/core!1687
| | | | * | | | | | | | fix urls on imported item taxonomyzotlabs2019-07-281-0/+9
| | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | emoji reactions from hubzilla becoming top level posts on zap because of ↵zotlabs2019-07-112-1/+14
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | missing object
| * | | | | | | | | I'm pretty sure the LD construct 'diaspora:guid' isn't actually legal ↵zotlabs2019-07-012-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without a definition of 'diaspora' in the current or parent LD context.
| * | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-07-011-1/+1
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-07-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missprint in German translation See merge request hubzilla/core!1688
| * | | | | | | | | Update hstrings.phpMax Kostikov2019-07-011-1/+1
| | | | | | | | | |
| | * | | | | | | | add opengraph meta info to channel pagezotlabs2019-06-291-0/+11
| | | | | | | | | |
| | * | | | | | | | zot_finger() and Zotlabs\Zot\Finger::run() have different output. Adjusted ↵zotlabs2019-06-281-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accordingly.
| | * | | | | | | | I wonder how long zot_finger() has been missing and how this may have ↵zotlabs2019-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | affected the directory servers.
| | * | | | | | | | minor fixzotlabs2019-06-281-1/+1
| | | | | | | | | |
| | * | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-285-11/+8
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | decode encoded midMario Vavti2019-06-281-2/+1
| | | | | | | | | |
* | | | | | | | | | missing class importMario Vavti2019-06-281-0/+1
| | | | | | | | | |
* | | | | | | | | | regenerate autoload cacheMario Vavti2019-06-282-2/+0
| | | | | | | | | |
* | | | | | | | | | support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-282-538/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9def9a5cb7ab7799911013580c714605e9698122)
* | | | | | | | | | photo objects: incorrect media type on linkszotlabs2019-06-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 60c003733e7fed70f28eadaf3d9abcf16ec3a8ab)
* | | | | | | | | | extend definition of direct message to anything with allow_cid but *not* ↵zotlabs2019-06-281-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow_gid. (cherry picked from commit 96a99935ef4f2da899275166b127537287966dac)
* | | | | | | | | | fix typoMario Vavti2019-06-271-1/+1
| | | | | | | | | |
* | | | | | | | | | do not check send_stream permission for commentsMario Vavti2019-06-271-7/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'httpsig' into 'dev'Mario2019-06-2722-177/+296
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http signature consolidation See merge request hubzilla/core!1685
| | | * | | | | | | | begin directory migration to zot6, see the code commentszotlabs2019-06-281-0/+26
| | | | | | | | | | |
| | | * | | | | | | | extend definition of direct message to anything with allow_cid but *not* ↵zotlabs2019-06-271-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow_gid.
| | | * | | | | | | | photo objects: incorrect media type on linkszotlabs2019-06-271-4/+4
| | | | | | | | | | |
| | | * | | | | | | | support zot and zot6 in social graph operations (suggestions, common friends)zotlabs2019-06-272-538/+19
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-2653-32045/+16193
| | |/| | | | | | | | | |/|/ / / / / / / / | |/| | | | | | | | |/| | | | | | | | |
* | | | | | | | | | port some functions from osadaMario Vavti2019-06-261-15/+272
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-06-262-1/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | provide auto redirect from zot6 /item permalinks See merge request hubzilla/core!1684