volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Collapse)	Author	Age	Files	Lines
*	provide ability to search webpages (either public or which contain the ↵	zotlabs	2017-05-30	3	-3/+9
\| \| \| \|	observer in the acl) in addition to conversations
*	update changelog	Mario Vavti	2017-05-30	1	-0/+1
\|
*	fix issue #790 - zip->open returned error 19 (not a valid zip archive). in ↵	Mario Vavti	2017-05-30	1	-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/dev	git-marijus	2017-05-29	1	-1/+6
\|\ \| \| \| \|	fix update_r1189() for mysql and postgres
\| *	fix update_r1189() for mysql and postgres	Mario Vavti	2017-05-28	1	-1/+6
\| \|
* \|	Merge pull request #796 from dawnbreak/QA_testing	git-marijus	2017-05-28	7	-142/+538
\|\ \ \| \|/ \|/\|	Testing HTML 2 Markdown conversion.
\| *	Don't drop PHP5 support yet.	Klaus Weidenbach	2017-05-27	1	-1/+1
\| \| \| \| \| \| \| \|	Scalar Type Hints and Return Type Declarations were introduced in PHP7.
\| *	:hammer::white_check_mark: Add html2markdown unit tests.	Klaus Weidenbach	2017-05-27	3	-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 Weidenbach	2017-05-24	4	-133/+330
\| \| \| \| \| \| \| \|	phpunit 6.1, behat, etc.
* \|	update changelog for 2.4	Mario Vavti	2017-05-28	1	-1/+78
\| \|
* \|	Merge pull request #798 from zotlabs/pagetitlefix	git-marijus	2017-05-27	3	-4/+6
\|\ \ \| \|/ \|/\|	hubzilla issue #795
\| *	hubzilla issue #795	zotlabs	2017-05-27	3	-4/+6
\|/
*	bump version	Mario Vavti	2017-05-23	1	-1/+1
\|
*	this looks like a slightly cleaner solution to the unicode dl issue	zotlabs	2017-05-23	1	-1/+1
\|
*	hubzilla issue #777	zotlabs	2017-05-23	1	-1/+1
\|
*	wiki auto language select to match webpages implementation	zotlabs	2017-05-23	2	-6/+28
\|
*	apporder style improvement and add to nav menu, also add language awareness ↵	zotlabs	2017-05-23	6	-17/+55
\| \| \| \|	to webpages
*	schema fixes	zotlabs	2017-05-23	2	-3/+7
\|
*	some issues with the app order template logic	zotlabs	2017-05-23	2	-7/+8
\|
*	apporder module and all the associated backend stuff to make it work; ↵	zotlabs	2017-05-23	5	-2/+153
\| \| \| \|	probably needs a bit of UI cleanup and a link to it from somewhere
*	Merge pull request #794 from dawnbreak/dev	git-marijus	2017-05-23	44	-3352/+2372
\|\ \| \| \| \|	Replace Mardownify library with html-to-markdown library.
\| *	Replace Mardownify library with html-to-markdown library.	Klaus Weidenbach	2017-05-23	44	-3352/+2372
\|/
*	bump version	Mario Vavti	2017-05-20	1	-1/+1
\|
*	resolve merge conflict	zotlabs	2017-05-20	2	-24/+24
\|
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-05-19	3	-13/+13
\|\
\| *	some styling for system notifications	Mario Vavti	2017-05-18	3	-13/+13
\| \|
* \|	smileybutton fixes	Mario Vavti	2017-05-19	1	-2/+0
\|/
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-05-17	13	-497/+2764
\|\
\| *	Merge pull request #783 from zotlabs/app_order	git-marijus	2017-05-17	2	-0/+46
\| \|\ \| \| \| \| \| \|	provide mechanism to arbitrarily sort the nav tray apps, currently th…
\| \| *	provide mechanism to arbitrarily sort the nav tray apps, currently the ↵	zotlabs	2017-05-16	2	-0/+46
\| \| \| \| \| \| \| \| \| \| \| \|	preferred order list needs to be manually created
\| * \|	Merge pull request #782 from dawnbreak/QA_testing	git-marijus	2017-05-17	2	-52/+254
\| \|\ \ \| \| \| \| \| \| \| \|	:construction_worker::white_check_mark: Documentation Permissions.php.
\| \| * \|	:construction_worker::white_check_mark: Documentation Permissions.php.	Klaus Weidenbach	2017-05-17	2	-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/docbug	git-marijus	2017-05-17	2	-10/+12
\| \|\ \ \| \| \| \| \| \| \| \|	no bug reporting info in docs
\| \| * \|	no bug reporting info in docs	zotlabs	2017-05-15	2	-10/+12
\| \| \| \|
\| * \| \|	Merge pull request #778 from beardyunixer/dev	git-marijus	2017-05-17	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Update nginx
\| \| * \| \|	Update nginx	Thomas Willingham	2017-05-15	1	-1/+1
\| \| \|/ /
\| * \| \|	Merge pull request #774 from zotlabs/pgapps	git-marijus	2017-05-17	1	-5/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Do not yet understand why on postgres, app['plugin'] gets set to 3 li…
\| \| * \| \|	Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ↵	zotlabs	2017-05-14	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	but this prevents it from rendering
\| * \| \| \|	Merge pull request #775 from zotlabs/pgstuff	git-marijus	2017-05-17	3	-429/+429
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|	always wonder about people who say "do as I say, not as I do..."
\| \| * \| \|	always wonder about people who say "do as I say, not as I do..."	zotlabs	2017-05-14	3	-429/+429
\| \| \| \|/ \| \| \|/\|
\| * \| \|	regenerate optimized autoload files	Mario Vavti	2017-05-16	2	-0/+2016
\| \| \| \|
\| * \| \|	include attach.php here (boot.php) instead of each file that uses it. ↵	zotlabs	2017-05-16	1	-0/+1
\| \|/ / \| \| \| \| \| \| \| \| \|	Eventually this needs to move to an autoloader.
* \| \|	css first aid for mod setup	Mario Vavti	2017-05-17	1	-0/+6
\| \| \|
* \| \|	silence php warning during install	Mario Vavti	2017-05-17	1	-1/+1
\|/ /
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Mario Vavti	2017-05-12	4	-16/+42
\|\ \
\| * \	Merge pull request #770 from zotlabs/mast496	git-marijus	2017-05-12	3	-14/+40
\| \|\ \ \| \| \| \| \| \| \| \|	consolidate and simplify the generation of activitystreams persons, a…
\| \| * \|	consolidate and simplify the generation of activitystreams persons, add a ↵	zotlabs	2017-05-11	3	-14/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also.
\| * \| \|	Merge pull request #771 from zotlabs/filesync	git-marijus	2017-05-12	1	-2/+2
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	issue #769
\| \| * \|	issue #769	zotlabs	2017-05-11	1	-2/+2
\| \| \|/
* \| /	Empty ACL should not result in no ACL when uploading a file	Mario Vavti	2017-05-11	1	-4/+5
\|/ /