Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-05 | 2 | -0/+73 |
|\ | | | | | | | | | missing piece of poll code See merge request hubzilla/core!1826 | ||||
| * | missing piece of poll code | zotlabs | 2020-01-31 | 2 | -0/+73 |
|/ | |||||
* | fix php warningà | Mario | 2020-01-31 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-01-31 | 8 | -11/+330 |
|\ | | | | | | | | | polls and other backend z6 compat work See merge request hubzilla/core!1825 | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-01-30 | 2 | -3/+17 |
| |\ | |/ |/| | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-01-30 | 1 | -3/+8 |
|\ \ | | | | | | | | | | | | | Prevent multiple database requests on name platform check See merge request hubzilla/core!1824 | ||||
| * | | Update System.php | Max Kostikov | 2020-01-30 | 1 | -2/+1 |
| | | | |||||
| * | | Update System.php | Max Kostikov | 2020-01-30 | 1 | -3/+4 |
| | | | |||||
| * | | Prevent multiple database requests on name platform check | Max Kostikov | 2020-01-30 | 1 | -3/+8 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2020-01-30 | 5 | -4/+34 |
|\ \ \ | | | | | | | | | | | | | | | | | z6 compat work See merge request hubzilla/core!1822 | ||||
| * | | | z6 compat work | Zot | 2020-01-30 | 5 | -4/+34 |
|/ / / | |||||
* | | | provide img and zmg tags with image description | Mario | 2020-01-30 | 1 | -0/+9 |
| | | | |||||
| | * | basic poll support and patch to not call System::get_platform_name() within ↵ | zotlabs | 2020-01-30 | 8 | -11/+330 |
| | | | | | | | | | | | | t() unless needed. Polls probably need refining and have not yet been fully tested after porting | ||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-01-29 | 2 | -2/+4 |
| | |\ | |_|/ |/| | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2020-01-26 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | bugfix: event_addtocal not preserving original privacy expectation See merge request hubzilla/core!1820 | ||||
* | | | | minor private forum notifications fixes | Mario | 2020-01-25 | 2 | -2/+4 |
| | | | | |||||
| | | * | z6 transition work - prevent z6 sync packets from being unpacked into an ↵ | zotlabs | 2020-01-29 | 3 | -3/+9 |
| | | | | | | | | | | | | | | | | incompatible schema | ||||
| | | * | more work on zap export | zotlabs | 2020-01-25 | 2 | -1/+25 |
| | |/ | |/| | |||||
| * | | bugfix: event_addtocal not preserving original privacy expectation | zotlabs | 2020-01-24 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-01-24 | 31 | -872/+634 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-01-23 | 2 | -389/+514 |
|\ \ \ | |||||
| * \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-01-22 | 2 | -389/+514 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Update Russian translation See merge request hubzilla/core!1819 | ||||
| | * | | Update hstrings.php | Max Kostikov | 2020-01-22 | 1 | -27/+48 |
| | | | | |||||
| | * | | Update hmessages.po | Max Kostikov | 2020-01-22 | 1 | -362/+466 |
| | | | | |||||
* | | | | make sure we import the zot6 xchan if we do not have it yet | Mario | 2020-01-23 | 1 | -1/+12 |
|/ / / | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2020-01-22 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | Don't validate domain with PTR record; remove uneccessary CNAME check; add IPv6 check See merge request hubzilla/core!1818 | ||||
| * | | Don't validate domain with PTR record; remove uneccessary CNAME check; add ↵ | Max Kostikov | 2020-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | IPv6 check | ||||
* | | | fix typo | Mario | 2020-01-21 | 1 | -1/+1 |
| | | | |||||
* | | | more shortlocalize and bdi tags | Mario | 2020-01-20 | 1 | -5/+9 |
| | | | |||||
* | | | the address or URL as linktitle should be sufficient | Mario | 2020-01-18 | 1 | -2/+2 |
| | | | |||||
* | | | missing update file | Mario | 2020-01-18 | 1 | -0/+25 |
| | | | |||||
* | | | we need 24h format | Mario | 2020-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | introduce db_str_to_date() | Mario | 2020-01-18 | 2 | -0/+13 |
| | | | |||||
* | | | fix shortlocalize | Mario | 2020-01-18 | 2 | -2/+2 |
| | | | |||||
* | | | move mail frontend to addons and remove mail app from system apps | Mario | 2020-01-18 | 6 | -459/+6 |
| | | | |||||
* | | | implement bdi tags via bbcode where possible | Mario | 2020-01-18 | 3 | -8/+14 |
| | | | |||||
* | | | more bdi tags | Mario | 2020-01-18 | 2 | -7/+7 |
| | | | |||||
* | | | wrap profile names in bdi tags to prevent mastodon-kiddies to mess with the ↵ | Mario | 2020-01-18 | 3 | -3/+3 |
| | | | | | | | | | | | | layout | ||||
* | | | $owner in get_feed_for() is the atom rendered channel, for atom_entry we ↵ | Mario | 2020-01-17 | 1 | -2/+2 |
| | | | | | | | | | | | | need the owners channel_id though. | ||||
* | | | some work on zot6 DMs | Mario | 2020-01-15 | 10 | -4/+35 |
| | | | |||||
* | | | fix typo | Mario | 2020-01-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2020-01-15 | 8 | -33/+344 |
|\ \ \ | | | | | | | | | | | | | | | | | event compatibility work See merge request hubzilla/core!1817 | ||||
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-01-14 | 865 | -25618/+41541 |
| | |/| | |/|/ | |/| |/| | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2020-01-14 | 1 | -6/+6 |
|\ \ \ | | |/ | |/| | | | | | | | Fix wrong URL detection with Markdown support enabled See merge request hubzilla/core!1816 | ||||
| * | | Fix wrong URL detection with Markdown support enabled | Max Kostikov | 2020-01-12 | 1 | -6/+6 |
| | | | |||||
* | | | composer update symfony/polyfill-ctype | Mario | 2020-01-12 | 4 | -23/+23 |
| | | | |||||
* | | | composer update sabre/dav | Mario | 2020-01-12 | 47 | -230/+365 |
| | | | |||||
* | | | update cropperjs to the recent version | Mario | 2020-01-11 | 210 | -18185/+23891 |
| | | | |||||
* | | | fix markdown test | Mario | 2020-01-09 | 1 | -2/+2 |
| | | | |||||
* | | | composer updates | Mario | 2020-01-09 | 32 | -410/+217 |
| | | |