aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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
| |/ /
| * / missing piece of poll codezotlabs2020-01-312-0/+73
|/ /
* | fix php warningÃMario2020-01-311-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2020-01-318-11/+330
|\ \ | | | | | | | | | | | | polls and other backend z6 compat work See merge request hubzilla/core!1825
| * \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-302-3/+17
| |\ \ | |/ / |/| |
* | | 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
| | | |
* | | | Merge branch 'dev' into 'dev'Mario2020-01-305-4/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | z6 compat work See merge request hubzilla/core!1822
| * | | | z6 compat workZot2020-01-305-4/+34
|/ / / /
* | | | provide img and zmg tags with image descriptionMario2020-01-301-0/+9
| | | |
| | * | basic poll support and patch to not call System::get_platform_name() within ↵zotlabs2020-01-308-11/+330
| | | | | | | | | | | | | | | | 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
| | |\ \ | |_|/ / |/| | |
| | * | z6 transition work - prevent z6 sync packets from being unpacked into an ↵zotlabs2020-01-293-3/+9
| | | | | | | | | | | | | | | | incompatible schema
| | * | more work on zap exportzotlabs2020-01-252-1/+25
| | | |
| | | * zap is storing perms different from hubzilla - revert Lib/Connect to use the ↵Mario2020-01-301-4/+5
| | | | | | | | | | | | | | | | hubzilla way. Eventually we might want to streamline this with zap. This will require a DB update to upgrade permissions in abconfig.
| | | * update create_identity() to use Lib/Connect via connect_and_sync() ported ↵Mario2020-01-261-5/+50
| | | | | | | | | | | | | | | | from zap
| | | * port Lib/Connect and Module/Follow from zap. Connect with new connections ↵Mario2020-01-265-23/+838
| |_|/ |/| | | | | | | | via zot6
* | | Merge branch 'dev' into 'dev'Mario2020-01-261-1/+1
|\ \ \ | | |/ | |/| | | | | | | bugfix: event_addtocal not preserving original privacy expectation See merge request hubzilla/core!1820
| * | bugfix: event_addtocal not preserving original privacy expectationzotlabs2020-01-241-1/+1
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-2431-872/+634
| |\ \
| * \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-14865-25618/+41541
| |\ \ \
* | | | | minor private forum notifications fixesMario2020-01-252-2/+4
| |_|/ / |/| | |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-01-232-389/+514
|\ \ \ \
| * \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2020-01-222-389/+514
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1819
| | * | | Update hstrings.phpMax Kostikov2020-01-221-27/+48
| | | | |
| | * | | Update hmessages.poMax Kostikov2020-01-221-362/+466
| | | | |
* | | | | make sure we import the zot6 xchan if we do not have it yetMario2020-01-231-1/+12
|/ / / /
* | | | Merge branch 'dev' into 'dev'Mario2020-01-221-1/+1
|\| | | | | | | | | | | | | | | | | | | Don't validate domain with PTR record; remove uneccessary CNAME check; add IPv6 check See merge request hubzilla/core!1818
| * | | Don't validate domain with PTR record; remove uneccessary CNAME check; add ↵Max Kostikov2020-01-191-1/+1
| | | | | | | | | | | | | | | | IPv6 check
* | | | fix typoMario2020-01-211-1/+1
| | | |
* | | | more shortlocalize and bdi tagsMario2020-01-201-5/+9
| | | |
* | | | the address or URL as linktitle should be sufficientMario2020-01-181-2/+2
| | | |
* | | | missing update fileMario2020-01-181-0/+25
| | | |
* | | | we need 24h formatMario2020-01-181-1/+1
| | | |
* | | | introduce db_str_to_date()Mario2020-01-182-0/+13
| | | |