aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Translate 'vote' button textMax Kostikov2020-03-061-1/+1
| | * Merge branch 'dev' into 'dev'Max Kostikov2020-03-0613-64/+358
| | |\ | | |/ | |/|
* / | provide tool to transform channels to zot6. WARNING: transformed channels wil...Mario2020-03-061-0/+200
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2020-03-011-3/+49
|\ \
| * | 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 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 titlesBattleMage2020-02-281-2/+5
|/ / /
* | | Merge branch 'dev' into 'dev'Mario2020-02-274-9/+81
|\| |
| * | 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 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
| |\| |
| | * | 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
| |\| |
| | * | 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 clonesMax Kostikov2020-02-245-36/+203
|/ /
* | Merge branch 'patch-20200221a' into 'dev'Mario2020-02-231-0/+6
|\ \
| * | 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
| |\ \
| | * | Revert "Use argv() instead URI parsing"Max Kostikov2020-02-205-235/+443
| |/ /
* / / fix warningMario2020-02-201-2/+2
|/ /
* | vote issueMario2020-02-201-1/+4
* | remove unused imagesMario2020-02-1377-217/+0
* | Merge branch 'dev' into 'dev'Max Kostikov2020-02-131-4/+4
|\|
| * issue with multi-line poll elementszotlabs2020-02-121-4/+4
* | fix notifications for pollsMario2020-02-113-9/+25
* | Merge branch 'dev' into 'dev'Mario2020-02-115-5/+27
|\|
| * fix poll responseszotlabs2020-02-103-2/+13
| * this allows polls to federate from hubzilla to zap, though still a remaining ...zotlabs2020-02-102-3/+14
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-02-104-5/+11
| |\ | |/ |/|
* | poll fixesMario2020-02-104-5/+11