aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2020-03-3120-168/+1315
|\ | | | | | | | | Sync dev See merge request kostikov/core!2
| * use Libsync::build_sync_packet() in mod item, default Lib/Queue driver to ↵Mario2020-03-294-44/+46
| | | | | | | | zot6 and some whitespace cleanup in queue_deliver()
| * fix check for existing hublocsMario2020-03-291-1/+2
| |
| * port fhublocs to zot6 and fix issue with primary detectionMario2020-03-291-9/+27
| |
| * Merge branch 'z6connect' into 'dev'Mario2020-03-2815-115/+1111
| |\ | | | | | | | | | | | | Transition to zot6 See merge request hubzilla/core!1823
| | * prevent mod fhublocs breaking things. it needs porting to zot6 but has no ↵Mario2020-03-281-0/+3
| | | | | | | | | | | | priority for now.
| | * fix z6_discover() to do the right thing after transitionMario2020-03-261-2/+2
| | |
| | * do not use channel_portable_id in process_channel_sync_delivery(). we should ↵Mario2020-03-252-5/+5
| | | | | | | | | | | | only accept sync packages from channels which are already transitioned to zot6.
| | * do not sync with incompatible hubsMario2020-03-241-1/+10
| | |
| | * one more typoMario2020-03-161-1/+1
| | |
| | * typoMario2020-03-161-1/+1
| | |
| | * Update 1236 and bump version to 4.7.4Mario2020-03-162-2/+117
| | |
| | * wrong variableMario2020-03-131-1/+1
| | |
| | * use xchan_guid_sig instead of channel_guid_sig since it slightly differs ↵Mario2020-03-121-5/+3
| | | | | | | | | | | | depending on *default* protocol
| | * first batch of zot6 transition patches. basic communication with ↵Mario2020-03-124-67/+73
| | | | | | | | | | | | transitioned channels *should* work now
| | * port create_identity() to zot6Mario2020-03-111-13/+17
| | |
| | * Merge branch 'dev' into z6connectMario2020-03-112-2/+132
| | |\ | | |/ | |/|
| * | z6trans preparation for db update 1236Mario2020-03-111-94/+24
| | |
| * | use 24h time formatMario2020-03-061-1/+1
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-03-061-1/+1
| |\ \
| | * \ Merge branch 'dev' into 'dev'Max Kostikov2020-03-061-1/+1
| | |\ \ | |_|/ / |/| | | | | | | | | | | Dev See merge request hubzilla/core!1845
* | | | Translate 'vote' button textMax Kostikov2020-03-061-1/+1
| | | |
* | | | Merge branch 'dev' into 'dev'Max Kostikov2020-03-0613-64/+358
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Sync dev See merge request kostikov/core!1
| | * | provide tool to transform channels to zot6. WARNING: transformed channels ↵Mario2020-03-061-0/+200
| |/ / | | | | | | | | | will not yet be functional without additional patches.
| | * Merge branch 'dev' into z6connectMario2020-03-02113-577/+1621
| | |\ | | |/ | |/|
| * | Merge branch 'dev' into 'dev'Max Kostikov2020-03-011-3/+49
| |\ \ | | | | | | | | | | | | | | | | rework img alt text - preserve legacy bbcode See merge request hubzilla/core!1844
| | * | rework img alt text - preserve legacy bbcodezotlabs2020-02-291-3/+49
| | | |
| * | | prevent duplicate votesMario2020-02-292-2/+30
| | | |
| * | | Merge branch 'dev' into 'dev'Mario2020-02-291-35/+58
| |\| | | | | | | | | | | | | | | | | | alt attribute for images See merge request hubzilla/core!1843
| | * | alt attribute for imageszotlabs2020-02-281-35/+58
| | | |
| * | | poll UI stringsMario2020-02-283-8/+12
| | | |
| * | | Merge branch 'wiki-link-titles' into 'dev'Mario2020-02-281-2/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Allow wiki link titles See merge request hubzilla/core!1842
| | * | | Allow wiki link titlesBattleMage2020-02-281-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'Mario2020-02-274-9/+81
| |\| | | | | | | | | | | | | | | | | | add iconfig to zot6 objects See merge request hubzilla/core!1835
| | * | add iconfig to zot6 objectszotlabs2020-02-234-9/+81
| | | |
| * | | version 4.7.3Mario2020-02-271-1/+1
| | | |
| * | | bump version4.7.2Mario2020-02-271-1/+1
| | | |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-02-264-18/+13
| |\ \ \
| | * \ \ Merge branch 'dev' into 'dev'Max Kostikov2020-02-262-6/+6
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1839
* | | | | Update hstrings.phpMax Kostikov2020-02-261-3/+3
| | | | |
* | | | | Update hmessages.poMax Kostikov2020-02-261-3/+3
| | | | |
| | * | | Merge branch 'dev' into 'dev'Max Kostikov2020-02-252-5/+5
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Fix missprint in Russian translation See merge request hubzilla/core!1838
* | | | | Update hmessages.poMax Kostikov2020-02-251-3/+3
| | | | |
* | | | | Update hstrings.phpMax Kostikov2020-02-251-2/+2
| | | | |
| | * | | Merge branch 'dev' into 'dev'Max Kostikov2020-02-242-7/+2
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Minor cdav related changes See merge request hubzilla/core!1836
* | | | | Update cdav import parameters commentMax Kostikov2020-02-241-2/+2
| | | | |
* | | | | Code reuseMax Kostikov2020-02-241-5/+0
| |/ / / |/| | |
| * | | implement poll UI in jotMario2020-02-266-15/+133
|/ / /
* | | Merge branch 'dev' into 'dev'Mario2020-02-245-36/+203
|\ \ \ | | | | | | | | | | | | | | | | Implement DAV calendars sync with clones See merge request hubzilla/core!1834
| * | | Implement DAV calendars sync with clonesMax Kostikov2020-02-245-36/+203
|/ / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 19:36:08 +0000