aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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
|/ / /
* | | Merge branch 'patch-20200221a' into 'dev'Mario2020-02-231-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Fix: hang on too few items See merge request hubzilla/core!1832
| * | | Fix: hang on too few itemsM. Dent2020-02-231-0/+6
|/ / /
* | | polls can also appear in sharesMario2020-02-231-1/+1
| | |
* | | implement optional events and polls filterMario2020-02-213-5/+63
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-02-205-235/+443
|\ \ \
| * \ \ Merge branch 'dev' into 'dev'Mario2020-02-205-235/+443
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Implement CardDAV address book sync with clones See merge request hubzilla/core!1829
| | * | | Revert "Use argv() instead URI parsing"Max Kostikov2020-02-205-235/+443
| |/ / / | | | | | | | | | | | | This reverts commit bcfb69eeeef6a0506a0ec0574a03b673df84a55a
* / / / fix warningMario2020-02-201-2/+2
|/ / /
* | | vote issueMario2020-02-201-1/+4
| | |