aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | remove unused imagesMario2020-02-1377-217/+0
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2020-02-131-4/+4
| |\| | | | | | | | | | | | | issue with multi-line poll elements See merge request hubzilla/core!1831
| | * 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
| |\| | | | | | | | | | | | | this allows polls to federate from hubzilla to zap, though still a remaining issue with voting See merge request hubzilla/core!1830
| | * 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
| | | | | | | | | | | | issue with voting
| | * 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
| |\ \ | | | | | | | | | | | | | | | | poll updates See merge request hubzilla/core!1828
| | | * 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' See merge request hubzilla/core!1827
| | * | 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
| |\ \ | | | | | | | | | | | | | | | | missing piece of poll code See merge request hubzilla/core!1826
| | | * poll updateszotlabs2020-02-096-36/+84
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 23:29:40 +0000