aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0788-24063/+3588
|\
| * update bs-devMario Vavti2017-06-0717-462/+3376
| |
| * Fixed TEXT fields with default values (fixes #803) in mysql creation script.Manuel Tancoigne2017-06-071-6/+6
| |
| * Merge pull request #809 from dawnbreak/QA_testinggit-marijus2017-06-072-11/+24
| |\ | | | | | | :construction_worker::white_check_mark: Add MySQL 5.7 in TravisCI.
| | * :construction_worker::white_check_mark: Add MySQL 5.7 in TravisCI.Klaus Weidenbach2017-06-052-11/+24
| | | | | | | | | | | | | | | | | | Use a Docker container to add MySQL 5.7 in TravisCI. A lot of sql_mode settings have changed with 5.7, so finnaly provide it to test against it.
| * | Looks like we need the mastodon feed check in core - grrr. Will do that for ↵zotlabs2017-06-071-0/+3
| | | | | | | | | | | | now until it can be put back into plugins.
| * | hubzilla issue #810zotlabs2017-06-072-2/+32
| | |
| * | whitespacezotlabs2017-06-071-3/+5
| | |
| * | always add a length to ostatus compat enclosures - even if unknown (0)zotlabs2017-06-071-1/+1
| | |
| * | ostatus feeds: extract photo information from posts and convert to ↵zotlabs2017-06-071-3/+42
| | | | | | | | | | | | enclosures as otherwise OStatus servers will strip them from the HTML in the feed and refuse to render them
| * | oembed: ensure that width and height are returned as type int and not floatzotlabs2017-06-071-2/+2
| | |
| * | make authenticated oembeds optional, default to false.zotlabs2017-06-071-1/+1
| | |
| * | include/socgraph - remove a few obsolete and long-deprecated functionszotlabs2017-06-071-71/+0
| | |
| * | cleanup onlyzotlabs2017-06-072-10/+9
| | |
| * | don't allow negative age in directory listingszotlabs2017-06-071-1/+1
| | |
| * | a slight tweak to author_is_pmable hook to make it usefulzotlabs2017-06-072-6/+6
| | |
| * | remove text_highlight css load from corezotlabs2017-06-071-1/+0
| | |
| * | add the hl tag to the bbcode refzotlabs2017-06-071-0/+3
| | |
| * | correct the bbcode documentation for syntax highlighted code blocks now that ↵zotlabs2017-06-071-1/+3
| | | | | | | | | | | | this is provided by a plugin.
| * | move code syntax highlighting to pluginzotlabs2017-06-0754-23416/+7
| | |
| * | re-arrange a few functionszotlabs2017-06-073-67/+68
| |/
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0611-93/+89
|\|
| * fix nav-tabs for dark schemegit-marijus2017-06-041-14/+8
| |
| * remove duplicate codegit-marijus2017-06-041-12/+0
| |
| * fix allow setting a default schema for the hub (issue #797) and allow ↵git-marijus2017-06-042-6/+16
| | | | | | | | selecting of focus (hubzilla default) schema if a default is set.
| * class mixupgit-marijus2017-06-041-1/+1
| |
| * rewrite wiki pages widget - no need for ajax on pageload, show the pages to ↵git-marijus2017-06-034-53/+57
| | | | | | | | not authenticated people.
| * convert randprof to use chanlink_hash() instead of chanlink_url() and filter ↵git-marijus2017-06-032-7/+7
| | | | | | | | sys channels by xchan.xchan_system instead of xchan_addr != sys@%
* | Revert "include/socgraph - remove a few obsolete and long-deprecated functions"zotlabs2017-06-011-0/+71
| | | | | | | | This reverts commit e2d028fb97b2d877c029d1fba8c34589250004da.
* | include/socgraph - remove a few obsolete and long-deprecated functionszotlabs2017-06-011-71/+0
|/
* Merge pull request #802 from zotlabs/searchwebpagesgit-marijus2017-06-013-3/+9
|\ | | | | provide ability to search webpages (either public or which contain th…
| * provide ability to search webpages (either public or which contain the ↵zotlabs2017-05-303-3/+9
| | | | | | | | observer in the acl) in addition to conversations
* | Merge pull request #805 from zotlabs/mailexportgit-marijus2017-06-012-6/+8
|\ \ | | | | | | minor export issue with mail
| * | minor export issue with mailzotlabs2017-05-312-6/+8
| |/
* | Merge pull request #804 from dawnbreak/devgit-marijus2017-06-0152-581/+925
|\ \ | |/ |/| :arrow_up:Update Sabre libraries.
| * :arrow_up:Update Sabre libraries.Klaus Weidenbach2017-06-0152-581/+925
|/
* update changelogMario Vavti2017-05-301-0/+1
|
* fix issue #790 - zip->open returned error 19 (not a valid zip archive). in ↵Mario Vavti2017-05-301-1/+2
| | | | case there are further issues we should probably also put a ob_end_clean() right before readfile()
* Merge pull request #800 from git-marijus/devgit-marijus2017-05-291-1/+6
|\ | | | | fix update_r1189() for mysql and postgres
| * fix update_r1189() for mysql and postgresMario Vavti2017-05-281-1/+6
| |
* | Merge pull request #796 from dawnbreak/QA_testinggit-marijus2017-05-287-142/+538
|\ \ | |/ |/| Testing HTML 2 Markdown conversion.
| * Don't drop PHP5 support yet.Klaus Weidenbach2017-05-271-1/+1
| | | | | | | | Scalar Type Hints and Return Type Declarations were introduced in PHP7.
| * :hammer::white_check_mark: Add html2markdown unit tests.Klaus Weidenbach2017-05-273-9/+208
| | | | | | | | | | | | A tiny refactoring to make HTML 2 markdown conversion testable. Add some unit tests to check the behavior of the now used HTML2Markdown library. There are some differences compared to the old pixel418/markdownify library.
| * :arrow_up: Update dev libraries.Klaus Weidenbach2017-05-244-133/+330
| | | | | | | | phpunit 6.1, behat, etc.
* | update changelog for 2.4Mario Vavti2017-05-281-1/+78
| |
* | Merge pull request #798 from zotlabs/pagetitlefixgit-marijus2017-05-273-4/+6
|\ \ | |/ |/| hubzilla issue #795
| * hubzilla issue #795zotlabs2017-05-273-4/+6
|/
* bump versionMario Vavti2017-05-231-1/+1
|
* this looks like a slightly cleaner solution to the unicode dl issuezotlabs2017-05-231-1/+1
|
* hubzilla issue #777zotlabs2017-05-231-1/+1
|