| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' into z6connect | Mario | 2020-03-11 | 1 | -0/+130 |
|\ |
|
| * | z6trans preparation for db update 1236 | Mario | 2020-03-11 | 1 | -94/+24 |
| * | 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 | 15 | -288/+872 |
|\| |
|
| * | prevent duplicate votes | Mario | 2020-02-29 | 1 | -1/+29 |
| * | Allow wiki link titles | BattleMage | 2020-02-28 | 1 | -2/+5 |
| * | Merge branch 'dev' into 'dev' | Mario | 2020-02-27 | 2 | -6/+51 |
| |\ |
|
| | * | add iconfig to zot6 objects | zotlabs | 2020-02-23 | 2 | -6/+51 |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-02-26 | 1 | -5/+0 |
| |\ \ |
|
| | * | | Code reuse | Max Kostikov | 2020-02-24 | 1 | -5/+0 |
| * | | | implement poll UI in jot | Mario | 2020-02-26 | 1 | -3/+58 |
| |/ / |
|
| * | | Implement DAV calendars sync with clones | Max Kostikov | 2020-02-24 | 2 | -34/+127 |
| * | | implement optional events and polls filter | Mario | 2020-02-21 | 2 | -5/+47 |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-02-20 | 2 | -235/+187 |
| |\ \ |
|
| | * | | Revert "Use argv() instead URI parsing" | Max Kostikov | 2020-02-20 | 2 | -235/+187 |
| * | | | fix warning | Mario | 2020-02-20 | 1 | -2/+2 |
| |/ / |
|
| * | | vote issue | Mario | 2020-02-20 | 1 | -1/+4 |
| * | | 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 | 2 | -2/+7 |
| |/ |
|
| * | fix poll responses | zotlabs | 2020-02-10 | 2 | -1/+12 |
| * | this allows polls to federate from hubzilla to zap, though still a remaining ... | zotlabs | 2020-02-10 | 2 | -3/+14 |
| * | poll fixes | Mario | 2020-02-10 | 3 | -4/+10 |
| * | poll updates | zotlabs | 2020-02-09 | 4 | -34/+67 |
| * | missing piece of poll code | zotlabs | 2020-01-31 | 1 | -0/+67 |
| * | fix php warningĂ | Mario | 2020-01-31 | 1 | -1/+1 |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-01-30 | 1 | -3/+8 |
| |\ |
|
| | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2020-01-30 | 1 | -3/+8 |
| | |\ |
|
| | | * | Update System.php | Max Kostikov | 2020-01-30 | 1 | -2/+1 |
| | | * | Update System.php | Max Kostikov | 2020-01-30 | 1 | -3/+4 |
| | | * | Prevent multiple database requests on name platform check | Max Kostikov | 2020-01-30 | 1 | -3/+8 |
| | * | | z6 compat work | Zot | 2020-01-30 | 2 | -3/+8 |
| * | | | basic poll support and patch to not call System::get_platform_name() within t... | zotlabs | 2020-01-30 | 3 | -6/+231 |
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2020-01-29 | 2 | -2/+4 |
| |\| | |
|
| * | | | z6 transition work - prevent z6 sync packets from being unpacked into an inco... | zotlabs | 2020-01-29 | 2 | -3/+8 |
* | | | | zap is storing perms different from hubzilla - revert Lib/Connect to use the ... | Mario | 2020-01-30 | 1 | -4/+5 |
* | | | | port Lib/Connect and Module/Follow from zap. Connect with new connections via... | Mario | 2020-01-26 | 4 | -23/+818 |
| |/ /
|/| | |
|
* | | | minor private forum notifications fixes | Mario | 2020-01-25 | 2 | -2/+4 |
|/ / |
|
* | | fix typo | Mario | 2020-01-21 | 1 | -1/+1 |
* | | the address or URL as linktitle should be sufficient | Mario | 2020-01-18 | 1 | -2/+2 |
* | | missing update file | Mario | 2020-01-18 | 1 | -0/+25 |
* | | fix shortlocalize | Mario | 2020-01-18 | 1 | -1/+1 |
* | | move mail frontend to addons and remove mail app from system apps | Mario | 2020-01-18 | 4 | -453/+4 |
* | | implement bdi tags via bbcode where possible | Mario | 2020-01-18 | 1 | -5/+5 |
* | | more bdi tags | Mario | 2020-01-18 | 2 | -7/+7 |
* | | some work on zot6 DMs | Mario | 2020-01-15 | 9 | -4/+33 |
* | | fix typo | Mario | 2020-01-15 | 1 | -1/+1 |
* | | Merge branch 'dev' into 'dev' | Mario | 2020-01-15 | 6 | -28/+320 |
|\ \ |
|
| * | | event compatibility work | zotlabs | 2020-01-14 | 5 | -16/+291 |
| * | | rework activitystreams events - send invite/event activities instead of creat... | zotlabs | 2020-01-12 | 2 | -12/+29 |