Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | prevent duplicate votes | Mario | 2020-02-29 | 2 | -2/+30 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-02-29 | 1 | -35/+58 |
|\ | | | | | | | | | alt attribute for images See merge request hubzilla/core!1843 | ||||
| * | alt attribute for images | zotlabs | 2020-02-28 | 1 | -35/+58 |
| | | |||||
* | | poll UI strings | Mario | 2020-02-28 | 3 | -8/+12 |
| | | |||||
* | | Merge branch 'wiki-link-titles' into 'dev' | Mario | 2020-02-28 | 1 | -2/+5 |
|\ \ | | | | | | | | | | | | | Allow wiki link titles See merge request hubzilla/core!1842 | ||||
| * | | Allow wiki link titles | BattleMage | 2020-02-28 | 1 | -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' | Mario | 2020-02-27 | 4 | -9/+81 |
|\| | | | | | | | | | add iconfig to zot6 objects See merge request hubzilla/core!1835 | ||||
| * | add iconfig to zot6 objects | zotlabs | 2020-02-23 | 4 | -9/+81 |
| | | |||||
* | | version 4.7.3 | Mario | 2020-02-27 | 1 | -1/+1 |
| | | |||||
* | | bump version4.7.2 | Mario | 2020-02-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-02-26 | 4 | -18/+13 |
|\ \ | |||||
| * \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-26 | 2 | -6/+6 |
| |\ \ | | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1839 | ||||
| | * | | Update hstrings.php | Max Kostikov | 2020-02-26 | 1 | -3/+3 |
| | | | | |||||
| | * | | Update hmessages.po | Max Kostikov | 2020-02-26 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-25 | 2 | -5/+5 |
| |\| | | | | | | | | | | | | | | | | | | Fix missprint in Russian translation See merge request hubzilla/core!1838 | ||||
| | * | | Update hmessages.po | Max Kostikov | 2020-02-25 | 1 | -3/+3 |
| | | | | |||||
| | * | | Update hstrings.php | Max Kostikov | 2020-02-25 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-24 | 2 | -7/+2 |
| |\| | | | | | | | | | | | | | | | | | | Minor cdav related changes See merge request hubzilla/core!1836 | ||||
| | * | | Update cdav import parameters comment | Max Kostikov | 2020-02-24 | 1 | -2/+2 |
| | | | | |||||
| | * | | Code reuse | Max Kostikov | 2020-02-24 | 1 | -5/+0 |
| |/ / | |||||
* / / | implement poll UI in jot | Mario | 2020-02-26 | 6 | -15/+133 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-02-24 | 5 | -36/+203 |
|\ \ | | | | | | | | | | | | | Implement DAV calendars sync with clones See merge request hubzilla/core!1834 | ||||
| * | | Implement DAV calendars sync with clones | Max Kostikov | 2020-02-24 | 5 | -36/+203 |
|/ / | |||||
* | | Merge branch 'patch-20200221a' into 'dev' | Mario | 2020-02-23 | 1 | -0/+6 |
|\ \ | | | | | | | | | | | | | Fix: hang on too few items See merge request hubzilla/core!1832 | ||||
| * | | Fix: hang on too few items | M. Dent | 2020-02-23 | 1 | -0/+6 |
|/ / | |||||
* | | polls can also appear in shares | Mario | 2020-02-23 | 1 | -1/+1 |
| | | |||||
* | | implement optional events and polls filter | Mario | 2020-02-21 | 3 | -5/+63 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-02-20 | 5 | -235/+443 |
|\ \ | |||||
| * \ | Merge branch 'dev' into 'dev' | Mario | 2020-02-20 | 5 | -235/+443 |
| |\ \ | | | | | | | | | | | | | | | | | Implement CardDAV address book sync with clones See merge request hubzilla/core!1829 | ||||
| | * | | Revert "Use argv() instead URI parsing" | Max Kostikov | 2020-02-20 | 5 | -235/+443 |
| |/ / | | | | | | | | | | This reverts commit bcfb69eeeef6a0506a0ec0574a03b673df84a55a | ||||
* / / | fix warning | Mario | 2020-02-20 | 1 | -2/+2 |
|/ / | |||||
* | | vote issue | Mario | 2020-02-20 | 1 | -1/+4 |
| | | |||||
* | | remove unused images | Mario | 2020-02-13 | 77 | -217/+0 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-13 | 1 | -4/+4 |
|\| | | | | | | | | | issue with multi-line poll elements See merge request hubzilla/core!1831 | ||||
| * | issue with multi-line poll elements | zotlabs | 2020-02-12 | 1 | -4/+4 |
| | | |||||
* | | fix notifications for polls | Mario | 2020-02-11 | 3 | -9/+25 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-02-11 | 5 | -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 responses | zotlabs | 2020-02-10 | 3 | -2/+13 |
| | | |||||
| * | this allows polls to federate from hubzilla to zap, though still a remaining ↵ | zotlabs | 2020-02-10 | 2 | -3/+14 |
| | | | | | | | | issue with voting | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-02-10 | 4 | -5/+11 |
| |\ | |/ |/| | |||||
* | | poll fixes | Mario | 2020-02-10 | 4 | -5/+11 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2020-02-10 | 6 | -36/+84 |
|\ \ | | | | | | | | | | | | | poll updates See merge request hubzilla/core!1828 | ||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-02-09 | 1 | -0/+2 |
| |/| | |/ |/| | |||||
* | | Merge branch 'patch-1' into 'dev' | Mario | 2020-02-07 | 1 | -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' | Voryzen | 2020-02-07 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-02-05 | 2 | -0/+73 |
|\ \ | | | | | | | | | | | | | missing piece of poll code See merge request hubzilla/core!1826 | ||||
| | * | poll updates | zotlabs | 2020-02-09 | 6 | -36/+84 |
| |/ | |||||
| * | missing piece of poll code | zotlabs | 2020-01-31 | 2 | -0/+73 |
|/ | |||||
* | fix php warningà | Mario | 2020-01-31 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-01-31 | 8 | -11/+330 |
|\ | | | | | | | | | polls and other backend z6 compat work See merge request hubzilla/core!1825 |