| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | first batch of zot6 transition patches. basic communication with transitioned... | Mario | 2020-03-12 | 4 | -67/+73 |
| | * | | port create_identity() to zot6 | Mario | 2020-03-11 | 1 | -13/+17 |
| | * | | Merge branch 'dev' into z6connect | Mario | 2020-03-11 | 2 | -2/+132 |
| | |\ \
| | |/ /
| |/| | |
|
| * | | | z6trans preparation for db update 1236 | Mario | 2020-03-11 | 1 | -94/+24 |
| * | | | use 24h time format | Mario | 2020-03-06 | 1 | -1/+1 |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-03-06 | 1 | -1/+1 |
| |\ \ \ |
|
| | * \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-06 | 1 | -1/+1 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | Translate 'vote' button text | Max Kostikov | 2020-03-06 | 1 | -1/+1 |
* | | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-06 | 13 | -64/+358 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | provide tool to transform channels to zot6. WARNING: transformed channels wil... | Mario | 2020-03-06 | 1 | -0/+200 |
| |/ / / |
|
| | * | | Merge branch 'dev' into z6connect | Mario | 2020-03-02 | 113 | -577/+1621 |
| | |\ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-03-01 | 1 | -3/+49 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | rework img alt text - preserve legacy bbcode | zotlabs | 2020-02-29 | 1 | -3/+49 |
| * | | | 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 | 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 | BattleMage | 2020-02-28 | 1 | -2/+5 |
| |/ / / |
|
| * | | | Merge branch 'dev' into 'dev' | Mario | 2020-02-27 | 4 | -9/+81 |
| |\| | |
|
| | * | | 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 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 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | 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 |
| | |\ \ \
| |_|/ / /
|/| | | | |
|
* | | | | | 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 | 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 | 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 |
| |\ \ \ |
|
| | * | | | Revert "Use argv() instead URI parsing" | Max Kostikov | 2020-02-20 | 5 | -235/+443 |
| |/ / / |
|
* / / / | 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 | 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 |
|\| | |
|