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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-11-08	12	-21/+426
\|\
\| *	css fixes	Mario Vavti	2017-11-08	2	-7/+7
\| \|
\| *	only show nav app link if we have a selected app	Mario Vavti	2017-11-08	1	-0/+2
\| \|
\| *	use text-muted on site location	Mario Vavti	2017-11-08	1	-1/+1
\| \|
\| *	truncate nav-app-link if appropriate	Mario	2017-11-08	3	-3/+8
\| \|
\| *	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-07	8	-4/+391
\| \|\
\| \| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-11-06	8	-13/+45
\| \| \|\
\| \| * \|	.htignore update	zotlabs	2017-11-06	2	-2/+3
\| \| \| \|
\| \| * \|	second half of issue #893 - move channel default permissions to its own ↵	zotlabs	2017-11-06	6	-1/+377
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	module so we can apply different page/widget layouts than for connedit; the relevant functionality is abandoned on mod_connedit but still intact. Trying a slightly different look/behaviour for inherited settings and the associated checkboxes. This may need a bit more tweaking but overall looks a lot cleaner.
\| \| * \|	bring back tabindex to submit comments	zotlabs	2017-11-06	1	-2/+12
\| \| \| \|
\| * \| \|	rename channel app events to calendar and add nav_set_selected() to /cal	Mario Vavti	2017-11-07	3	-7/+6
\| \| \| \|
\| * \| \|	move style out of template	Mario Vavti	2017-11-07	2	-3/+7
\| \| \| \|
\| * \| \|	add location info to the navbar	Mario Vavti	2017-11-07	2	-8/+16
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-11-06	15	-108/+126
\|\\| \|
\| * \|	update es-es help.html	Mario Vavti	2017-11-06	1	-1/+1
\| \| \|
\| * \|	Merge pull request #900 from anaqreon/dev	git-marijus	2017-11-06	5	-7/+39
\| \|\ \ \| \| \| \| \| \| \| \|	Add Manuel's Spanish translations for context help
\| \| * \|	Update help.html	Andrew Manning	2017-11-04	1	-2/+2
\| \| \| \|
\| \| * \|	Add Manuel's Spanish translations for context help	Andrew Manning	2017-11-02	5	-7/+39
\| \| \| \|
\| * \| \|	lets try this in the wild for a while	Mario Vavti	2017-11-06	2	-5/+5
\| \| \| \|
\| * \| \|	fix unable to mark all messages read	Mario Vavti	2017-11-06	1	-1/+1
\| \| \|/ \| \|/\|
\| * \|	attach.php minor cleanup and doc	zotlabs	2017-11-06	1	-61/+26
\| \| \|
\| * \|	allow cloud filenames to include ampersands without messing up auth tokens ↵	zotlabs	2017-11-05	4	-32/+15
\| \| \| \| \| \| \| \| \| \| \| \|	(zid, owt, and zat, and the constant placeholder 'f=')
\| * \|	common connections on suggestion page showing wildly different results than ↵	zotlabs	2017-11-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	remote profile, and is consistently off by one
\| * \|	fix can_comment_on_post() after recent code cleanup (a required array ↵	zotlabs	2017-11-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	parameter was missing)
\| * \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-11-04	2089	-505286/+492846
\| \|\ \
\| * \ \	Merge branch 'dev_merge'	zotlabs	2017-11-04	1	-0/+37
\| \|\ \ \
\| \| * \| \|	developer certificate of origin	zotlabs	2017-11-04	1	-0/+37
\| \| \| \| \|
\| * \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-11-03	4	-16/+11
\| \|\ \ \ \
* \| \ \ \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-11-04	2092	-505289/+492863
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| / / \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	fix wrong variable in sprintf resulting in php warning	Mario Vavti	2017-11-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #883 from dawnbreak/docu	git-marijus	2017-11-04	26	-1254/+2153
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	:bulb: Improving Doxygen documentation.
\| \| * \ \ \	Merge branch 'dev' into docu	git-marijus	2017-11-04	0	-0/+0
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	Merge branch 'dev' into docu	git-marijus	2017-11-04	2070	-504039/+490740
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge pull request #891 from dawnbreak/langlibs	git-marijus	2017-11-04	2063	-504033/+490694
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Langlibs updates
\| \| * \| \| \| \|	:white_check_mark: Some more work on unit tests.	Klaus Weidenbach	2017-10-29	6	-177/+261
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some small improvements for coverage report. Add more functions from include/text.php Update composer dev libraries for phpunit.
\| \| * \| \| \| \|	:arrow_up: Update intl library.	Klaus Weidenbach	2017-10-29	2034	-499059/+486344
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update intl library from v0.4? (2014) to v0.7.4 (2016). Use global composer autoloader now.
\| \| * \| \| \| \|	:arrow_up: Update Text_LanguageDetect.	Klaus Weidenbach	2017-10-29	24	-2489/+1614
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update from v0.3.0 (2012) to v1.0.0 (2017) which should remove some warnings and improve PHP7 support. Using composer to handle this PEAR library now. Fix a problem in FeedutilsTest.
\| \| * \| \| \| \|	:white_check_mark: Some unit test for include/language.php	Klaus Weidenbach	2017-10-26	2	-0/+167
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unfortunately not so much unit testable, but added in preparation to update LanguageDetect and Intl library.
\| * \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-04	4	-4/+18
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| / / \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| \| * \| \| \|	provide short localised summary for likes that will end up in displayed ↵	zotlabs	2017-11-03	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	notifications
\| \| * \| \| \|	more search work	zotlabs	2017-11-03	2	-3/+1
\| \| \| \| \| \|
\| \| \| \| * \|	:bulb: Improving Doxygen documentation.	Klaus Weidenbach	2017-11-03	26	-1258/+2168
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix some Doxygen parsing errors. Improve hooks documentation.
* \| \| \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-11-03	13	-26/+115
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-03	3	-5/+42
\| \|\\| \| \| \| \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	imagedata not set correctly if large photo AND imagick is not installed	zotlabs	2017-11-03	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	fix cloud redirects with owt tokens	zotlabs	2017-11-03	2	-5/+39
\| \| \| \| \|
\| * \| \| \|	update item_normal() to not include ACTIVITY_OBJ_FILE obj_type	Mario Vavti	2017-11-03	3	-16/+9
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-03	6	-5/+62
\| \|\\| \| \|
\| \| * \| \|	hubzilla issue #896	zotlabs	2017-11-02	3	-0/+50
\| \| \| \| \|
\| \| * \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-11-02	3	-6/+6
\| \| \|\ \ \