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

	Commit message (Expand)	Author	Age	Files	Lines
*	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 modul...	zotlabs	2017-11-06	6	-1/+377
\| * \|	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
\| \|/ \|/\|
* \|	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
\|\ \
\| * \|	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 (z...	zotlabs	2017-11-05	4	-32/+15
* \|	common connections on suggestion page showing wildly different results than r...	zotlabs	2017-11-05	1	-2/+2
* \|	fix can_comment_on_post() after recent code cleanup (a required array paramet...	zotlabs	2017-11-04	1	-0/+1
* \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-11-04	2089	-505286/+492846
\|\ \
\| * \|	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
\| \|\ \
\| \| * \	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
\| \|\ \ \
\| \| * \| \|	:white_check_mark: Some more work on unit tests.	Klaus Weidenbach	2017-10-29	6	-177/+261
\| \| * \| \|	:arrow_up: Update intl library.	Klaus Weidenbach	2017-10-29	2034	-499059/+486344
\| \| * \| \|	:arrow_up: Update Text_LanguageDetect.	Klaus Weidenbach	2017-10-29	24	-2489/+1614
\| \| * \| \|	:white_check_mark: Some unit test for include/language.php	Klaus Weidenbach	2017-10-26	2	-0/+167
\| * \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-04	4	-4/+18
\| \|\ \ \ \
\| \| \| \| * \|	:bulb: Improving Doxygen documentation.	Klaus Weidenbach	2017-11-03	26	-1258/+2168
* \| \| \| \| \|	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 dev_merge	zotlabs	2017-11-03	13	-26/+115
\| \|\\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-11-02	7	-15/+53
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-11-01	32	-44/+257
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2017-10-29	2	-9/+9
\| \|\ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge	zotlabs	2017-11-03	4	-16/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| / / / / \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-03	3	-5/+42
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	set $module_format to html to not break updates. it will be set to something ...	Mario Vavti	2017-11-03	1	-0/+2
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	provide short localised summary for likes that will end up in displayed notif...	zotlabs	2017-11-03	2	-1/+17
* \| \| \| \| \| \| \| \|	more search work	zotlabs	2017-11-03	2	-3/+1
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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
\| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	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
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-02	4	-8/+36
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'mike/master' into dev	Mario Vavti	2017-11-02	1	-1/+11
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	fix issues with diaspora xchans	Mario Vavti	2017-11-02	3	-6/+6
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|