aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-20200221a' into 'dev'Mario2020-02-231-0/+6
|\
| * Fix: hang on too few itemsM. Dent2020-02-231-0/+6
|/
* polls can also appear in sharesMario2020-02-231-1/+1
* implement optional events and polls filterMario2020-02-213-5/+63
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-02-205-235/+443
|\
| * Merge branch 'dev' into 'dev'Mario2020-02-205-235/+443
| |\
| | * Revert "Use argv() instead URI parsing"Max Kostikov2020-02-205-235/+443
| |/
* / fix warningMario2020-02-201-2/+2
|/
* vote issueMario2020-02-201-1/+4
* remove unused imagesMario2020-02-1377-217/+0
* Merge branch 'dev' into 'dev'Max Kostikov2020-02-131-4/+4
|\
| * 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
|\|
| * 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
| * 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
|\ \
| | * 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'Voryzen2020-02-071-0/+2
|/ /
* | Merge branch 'dev' into 'dev'Max Kostikov2020-02-052-0/+73
|\ \
| | * 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
|\
| * 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
|\ \
| * | 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 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 t...zotlabs2020-01-308-11/+330
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-01-292-2/+4
| | |\ | |_|/ |/| |
* | | Merge branch 'dev' into 'dev'Mario2020-01-261-1/+1
|\ \ \
* | | | minor private forum notifications fixesMario2020-01-252-2/+4
| | | * z6 transition work - prevent z6 sync packets from being unpacked into an inco...zotlabs2020-01-293-3/+9
| | | * more work on zap exportzotlabs2020-01-252-1/+25
| | |/ | |/|
| * | 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 devMario2020-01-232-389/+514
|\ \ \
| * \ \ Merge branch 'dev' into 'dev'Max Kostikov2020-01-222-389/+514
| |\ \ \ | | | |/ | | |/|
| | * | 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 IP...Max Kostikov2020-01-191-1/+1