Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-08-01 | 1 | -4/+2 |
|\ | | | | | | | | | Minor optimizations on static file serve See merge request hubzilla/core!1699 | ||||
| * | Minor optimizations on static file serve | Max Kostikov | 2019-08-01 | 1 | -4/+2 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-31 | 2 | -5/+5 |
|\| | | | | | | | | | Update Russian translation See merge request hubzilla/core!1698 | ||||
| * | Update hstrings.php | Max Kostikov | 2019-07-31 | 1 | -2/+2 |
| | | |||||
| * | Update hmessages.po | Max Kostikov | 2019-07-31 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-31 | 1 | -1/+1 |
|\| | | | | | | | | | Do not limit channel if service class property value set with 0 See merge request hubzilla/core!1697 | ||||
| * | Update account.php | Max Kostikov | 2019-07-31 | 1 | -1/+1 |
| | | |||||
| * | Do not limit channel if service class property value set with 0 | Max Kostikov | 2019-07-31 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-07-30 | 1 | -0/+2 |
|\| | | | | | | | | | Do not control limits on service class settings with 0 values See merge request hubzilla/core!1696 | ||||
| * | Update account.php | Max Kostikov | 2019-07-30 | 1 | -1/+3 |
| | | |||||
| * | Do not control limits on service class settings with 0 values | Max Kostikov | 2019-07-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-07-30 | 2 | -1/+10 |
|\ \ | |/ |/| | | | | | fix urls on imported item taxonomy See merge request hubzilla/core!1695 | ||||
| * | hz core issue #1386 - function name must be a string | zotlabs | 2019-07-28 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-07-28 | 24 | -338/+501 |
| |\ | |/ |/| | |||||
* | | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-07-25 | 4 | -6/+6 |
| | | | | | | This reverts merge request !1694 | ||||
* | | minor css adjustions | Mario Vavti | 2019-07-23 | 3 | -7/+7 |
| | | |||||
* | | pleroma uses slightly different URLs in body - also look for the string | Mario Vavti | 2019-07-22 | 1 | -1/+1 |
| | | |||||
* | | reflect repeats in notifications, use force flag for import_xchan_photo() in ↵ | Mario Vavti | 2019-07-22 | 3 | -7/+14 |
| | | | | | | | | cron | ||||
* | | move image attachments to the top | Mario Vavti | 2019-07-19 | 1 | -2/+2 |
| | | |||||
* | | add hashtag to appschema and bump appschema rev | Mario Vavti | 2019-07-18 | 2 | -3/+5 |
| | | |||||
* | | fallback to id if href is not available | Mario Vavti | 2019-07-18 | 1 | -1/+1 |
| | | |||||
* | | do not format hashtags with missing url | Mario Vavti | 2019-07-18 | 1 | -1/+3 |
| | | |||||
* | | fix issue with encoding hashtags and silence parent fetch logging | Mario Vavti | 2019-07-18 | 1 | -3/+3 |
| | | |||||
* | | streamline keyId and creator/actor | Mario Vavti | 2019-07-17 | 1 | -3/+3 |
| | | |||||
* | | minor css fix | Mario Vavti | 2019-07-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-07-16 | 4 | -6/+6 |
|\ \ | | | | | | | | | | | | | Exclude trailing punctuations from URL See merge request hubzilla/core!1694 | ||||
| * | | Exclude trailing punctuations from URL | Max Kostikov | 2019-07-16 | 4 | -6/+6 |
|/ / | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-07-15 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-07-15 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Fix ETag quotes See merge request hubzilla/core!1693 | ||||
| | * | | Fix ETag quotes | Max Kostikov | 2019-07-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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 | ||||
* | | | | 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 | ||||
| | | | * | fix urls on imported item taxonomy | zotlabs | 2019-07-28 | 1 | -0/+9 |
| | | |/ | | |/| | |||||
| | * | | emoji reactions from hubzilla becoming top level posts on zap because of ↵ | zotlabs | 2019-07-11 | 2 | -1/+14 |
| |/ / | | | | | | | | | | missing object |