aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* prevent duplicate votesMario2020-02-291-1/+29
|
* 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-272-6/+51
|\ | | | | | | | | add iconfig to zot6 objects See merge request hubzilla/core!1835
| * add iconfig to zot6 objectszotlabs2020-02-232-6/+51
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-02-261-5/+0
|\ \
| * | Code reuseMax Kostikov2020-02-241-5/+0
| | |
* | | implement poll UI in jotMario2020-02-261-3/+58
|/ /
* | Implement DAV calendars sync with clonesMax Kostikov2020-02-242-34/+127
| |
* | implement optional events and polls filterMario2020-02-212-5/+47
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-02-202-235/+187
|\ \
| * | Revert "Use argv() instead URI parsing"Max Kostikov2020-02-202-235/+187
| | | | | | | | | | | | This reverts commit bcfb69eeeef6a0506a0ec0574a03b673df84a55a
* | | fix warningMario2020-02-201-2/+2
|/ /
* | vote issueMario2020-02-201-1/+4
| |
* | 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-112-2/+7
|/
* fix poll responseszotlabs2020-02-102-1/+12
|
* this allows polls to federate from hubzilla to zap, though still a remaining ↵zotlabs2020-02-102-3/+14
| | | | issue with voting
* poll fixesMario2020-02-103-4/+10
|
* poll updateszotlabs2020-02-094-34/+67
|
* missing piece of poll codezotlabs2020-01-311-0/+67
|
* fix php warningÃMario2020-01-311-1/+1
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-301-3/+8
|\
| * Merge branch 'dev' into 'dev'Max Kostikov2020-01-301-3/+8
| |\ | | | | | | | | | | | | Prevent multiple database requests on name platform check See merge request hubzilla/core!1824
| | * Update System.phpMax Kostikov2020-01-301-2/+1
| | |
| | * Update System.phpMax Kostikov2020-01-301-3/+4
| | |
| | * Prevent multiple database requests on name platform checkMax Kostikov2020-01-301-3/+8
| | |
| * | z6 compat workZot2020-01-302-3/+8
| | |
* | | basic poll support and patch to not call System::get_platform_name() within ↵zotlabs2020-01-303-6/+231
| | | | | | | | | | | | t() unless needed. Polls probably need refining and have not yet been fully tested after porting
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-292-2/+4
|\| |
| * | minor private forum notifications fixesMario2020-01-252-2/+4
| | |
* | | z6 transition work - prevent z6 sync packets from being unpacked into an ↵zotlabs2020-01-292-3/+8
|/ / | | | | | | incompatible schema
* | fix typoMario2020-01-211-1/+1
| |
* | the address or URL as linktitle should be sufficientMario2020-01-181-2/+2
| |
* | missing update fileMario2020-01-181-0/+25
| |
* | fix shortlocalizeMario2020-01-181-1/+1
| |
* | move mail frontend to addons and remove mail app from system appsMario2020-01-184-453/+4
| |
* | implement bdi tags via bbcode where possibleMario2020-01-181-5/+5
| |
* | more bdi tagsMario2020-01-182-7/+7
| |
* | some work on zot6 DMsMario2020-01-159-4/+33
| |
* | fix typoMario2020-01-151-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2020-01-156-28/+320
|\ \ | | | | | | | | | | | | event compatibility work See merge request hubzilla/core!1817
| * | event compatibility workzotlabs2020-01-145-16/+291
| | |
| * | rework activitystreams events - send invite/event activities instead of ↵zotlabs2020-01-122-12/+29
| | | | | | | | | | | | create/event. Also a first pass at creating a Zap export file from Hubzilla. Much more work is needed before this is functional.
* | | Merge branch 'dev' into 'dev'Mario2020-01-091-3/+11
|\ \ \ | | |/ | |/| | | | | | | Add age choice on cached item retrieve See merge request hubzilla/core!1813
| * | Update Cache.phpMax Kostikov2020-01-061-2/+1
| | |
| * | Add age choice on cached item retrieveMax Kostikov2020-01-051-2/+11
| | |
* | | pubstream: use search mode for tag filter view and add a titleMario2019-12-281-2/+7
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-161-2/+2
|\| | | | | | | | | | | | | | Fix possibly unknown author See merge request hubzilla/core!1808
| * | Fix possibly unknown authorMax Kostikov2019-12-161-2/+2
| | |