aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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@%
* 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
|
* wiki auto language select to match webpages implementationzotlabs2017-05-232-6/+28
|
* apporder style improvement and add to nav menu, also add language awareness ↵zotlabs2017-05-236-17/+55
| | | | to webpages
* schema fixeszotlabs2017-05-232-3/+7
|
* some issues with the app order template logiczotlabs2017-05-232-7/+8
|
* apporder module and all the associated backend stuff to make it work; ↵zotlabs2017-05-235-2/+153
| | | | probably needs a bit of UI cleanup and a link to it from somewhere
* Merge pull request #794 from dawnbreak/devgit-marijus2017-05-2344-3352/+2372
|\ | | | | Replace Mardownify library with html-to-markdown library.
| * Replace Mardownify library with html-to-markdown library.Klaus Weidenbach2017-05-2344-3352/+2372
|/
* bump versionMario Vavti2017-05-201-1/+1
|
* resolve merge conflictzotlabs2017-05-202-24/+24
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-193-13/+13
|\
| * some styling for system notificationsMario Vavti2017-05-183-13/+13
| |
* | smileybutton fixesMario Vavti2017-05-191-2/+0
|/
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-1713-497/+2764
|\
| * Merge pull request #783 from zotlabs/app_ordergit-marijus2017-05-172-0/+46
| |\ | | | | | | provide mechanism to arbitrarily sort the nav tray apps, currently th…
| | * provide mechanism to arbitrarily sort the nav tray apps, currently the ↵zotlabs2017-05-162-0/+46
| | | | | | | | | | | | preferred order list needs to be manually created
| * | Merge pull request #782 from dawnbreak/QA_testinggit-marijus2017-05-172-52/+254
| |\ \ | | | | | | | | :construction_worker::white_check_mark: Documentation Permissions.php.
| | * | :construction_worker::white_check_mark: Documentation Permissions.php.Klaus Weidenbach2017-05-172-52/+254
| | |/ | | | | | | | | | | | | Also add some phpunit tests for this class, but there are some problems yet with mocking static functions.
| * | Merge pull request #780 from zotlabs/docbuggit-marijus2017-05-172-10/+12
| |\ \ | | | | | | | | no bug reporting info in docs
| | * | no bug reporting info in docszotlabs2017-05-152-10/+12
| | | |