Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-31 | 20 | -168/+1315 | |
| | | |\ | |_|_|/ |/| | | | | | | | | | | | Sync dev See merge request kostikov/core!2 | |||||
* | | | | use Libsync::build_sync_packet() in mod item, default Lib/Queue driver to ↵ | Mario | 2020-03-29 | 4 | -44/+46 | |
| | | | | | | | | | | | | | | | | zot6 and some whitespace cleanup in queue_deliver() | |||||
* | | | | fix check for existing hublocs | Mario | 2020-03-29 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | port fhublocs to zot6 and fix issue with primary detection | Mario | 2020-03-29 | 1 | -9/+27 | |
| | | | | ||||||
* | | | | Merge branch 'z6connect' into 'dev' | Mario | 2020-03-28 | 15 | -115/+1111 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Transition to zot6 See merge request hubzilla/core!1823 | |||||
| * | | | prevent mod fhublocs breaking things. it needs porting to zot6 but has no ↵ | Mario | 2020-03-28 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | priority for now. | |||||
| * | | | fix z6_discover() to do the right thing after transition | Mario | 2020-03-26 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | do not use channel_portable_id in process_channel_sync_delivery(). we should ↵ | Mario | 2020-03-25 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | only accept sync packages from channels which are already transitioned to zot6. | |||||
| * | | | do not sync with incompatible hubs | Mario | 2020-03-24 | 1 | -1/+10 | |
| | | | | ||||||
| * | | | one more typo | Mario | 2020-03-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | typo | Mario | 2020-03-16 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update 1236 and bump version to 4.7.4 | Mario | 2020-03-16 | 2 | -2/+117 | |
| | | | | ||||||
| * | | | wrong variable | Mario | 2020-03-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | use xchan_guid_sig instead of channel_guid_sig since it slightly differs ↵ | Mario | 2020-03-12 | 1 | -5/+3 | |
| | | | | | | | | | | | | | | | | depending on *default* protocol | |||||
| * | | | first batch of zot6 transition patches. basic communication with ↵ | Mario | 2020-03-12 | 4 | -67/+73 | |
| | | | | | | | | | | | | | | | | transitioned channels *should* work now | |||||
| * | | | port create_identity() to zot6 | Mario | 2020-03-11 | 1 | -13/+17 | |
| | | | | ||||||
| * | | | Merge branch 'dev' into z6connect | Mario | 2020-03-11 | 2 | -2/+132 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | z6trans preparation for db update 1236 | Mario | 2020-03-11 | 1 | -94/+24 | |
| | | | | ||||||
* | | | | use 24h time format | Mario | 2020-03-06 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-03-06 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-06 | 1 | -1/+1 | |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | Dev See merge request hubzilla/core!1845 | |||||
| | * | | | Translate 'vote' button text | Max Kostikov | 2020-03-06 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-06 | 13 | -64/+358 | |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Sync dev See merge request kostikov/core!1 | |||||
* / | | | | provide tool to transform channels to zot6. WARNING: transformed channels ↵ | Mario | 2020-03-06 | 1 | -0/+200 | |
|/ / / / | | | | | | | | | | | | | will not yet be functional without additional patches. | |||||
| | * | | Merge branch 'dev' into z6connect | Mario | 2020-03-02 | 113 | -577/+1621 | |
| | |\ \ | |_|/ / |/| | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-01 | 1 | -3/+49 | |
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | rework img alt text - preserve legacy bbcode See merge request hubzilla/core!1844 | |||||
| * | | | rework img alt text - preserve legacy bbcode | zotlabs | 2020-02-29 | 1 | -3/+49 | |
| | | | | ||||||
* | | | | prevent duplicate votes | Mario | 2020-02-29 | 2 | -2/+30 | |
| | | | | ||||||
* | | | | Merge branch 'dev' into 'dev' | Mario | 2020-02-29 | 1 | -35/+58 | |
|\| | | | | | | | | | | | | | | | | | | | alt attribute for images See merge request hubzilla/core!1843 | |||||
| * | | | alt attribute for images | zotlabs | 2020-02-28 | 1 | -35/+58 | |
| | | | | ||||||
* | | | | poll UI strings | Mario | 2020-02-28 | 3 | -8/+12 | |
| | | | | ||||||
* | | | | Merge branch 'wiki-link-titles' into 'dev' | Mario | 2020-02-28 | 1 | -2/+5 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Allow wiki link titles See merge request hubzilla/core!1842 | |||||
| * | | | | Allow wiki link titles | BattleMage | 2020-02-28 | 1 | -2/+5 | |
|/ / / / | | | | | | | | | | | | | | | | | Allow linking to wiki pages with alternating titles by separating the title from the link with a pipe, like regular wiki markup does. | |||||
* | | | | Merge branch 'dev' into 'dev' | Mario | 2020-02-27 | 4 | -9/+81 | |
|\| | | | | | | | | | | | | | | | | | | | add iconfig to zot6 objects See merge request hubzilla/core!1835 | |||||
| * | | | add iconfig to zot6 objects | zotlabs | 2020-02-23 | 4 | -9/+81 | |
| | | | | ||||||
* | | | | version 4.7.3 | Mario | 2020-02-27 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | bump version4.7.2 | Mario | 2020-02-27 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-02-26 | 4 | -18/+13 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-26 | 2 | -6/+6 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1839 | |||||
| | * | | | Update hstrings.php | Max Kostikov | 2020-02-26 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Update hmessages.po | Max Kostikov | 2020-02-26 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-25 | 2 | -5/+5 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Fix missprint in Russian translation See merge request hubzilla/core!1838 | |||||
| | * | | | Update hmessages.po | Max Kostikov | 2020-02-25 | 1 | -3/+3 | |
| | | | | | ||||||
| | * | | | Update hstrings.php | Max Kostikov | 2020-02-25 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-24 | 2 | -7/+2 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Minor cdav related changes See merge request hubzilla/core!1836 | |||||
| | * | | | Update cdav import parameters comment | Max Kostikov | 2020-02-24 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Code reuse | Max Kostikov | 2020-02-24 | 1 | -5/+0 | |
| |/ / / | ||||||
* / / / | implement poll UI in jot | Mario | 2020-02-26 | 6 | -15/+133 | |
|/ / / | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2020-02-24 | 5 | -36/+203 | |
|\ \ \ | | | | | | | | | | | | | | | | | Implement DAV calendars sync with clones See merge request hubzilla/core!1834 | |||||
| * | | | Implement DAV calendars sync with clones | Max Kostikov | 2020-02-24 | 5 | -36/+203 | |
|/ / / |