aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
* | | Merge branch 'dev' into 'dev'Mario2020-02-106-36/+84
|\ \ \
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-02-091-0/+2
| |/| | | |/ / |/| |
* | | Merge branch 'patch-1' into 'dev'Mario2020-02-071-0/+2
|\ \ \
| * | | Add 'hook call' to be used for new addon 'NavBanner_options'Voryzen2020-02-071-0/+2
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2020-02-052-0/+73
|\ \ \
| | * | poll updateszotlabs2020-02-096-36/+84
| |/ /
| * / missing piece of poll codezotlabs2020-01-312-0/+73
|/ /
* | fix php warningÃMario2020-01-311-1/+1
* | Merge branch 'dev' into 'dev'Mario2020-01-318-11/+330
|\ \
| * \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-302-3/+17
| |\ \ | |/ / |/| |
* | | Merge branch 'dev' into 'dev'Max Kostikov2020-01-301-3/+8
|\ \ \
| * | | Update System.phpMax Kostikov2020-01-301-2/+1
| * | | Update System.phpMax Kostikov2020-01-301-3/+4