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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #308 from HaakonME/master	Jeroen van Riet Paap	2016-03-07	3	-6981/+7204
\|\
\| *	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-07	1	-1/+1
\| \|\
\| * \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-06	3	-1/+3
\| \|\ \
\| * \| \|	Updated Norwegian strings for Hubzilla	Haakon Meland Eriksen	2016-03-05	2	-6981/+7203
\| * \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-05	3	-494/+521
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-04	2	-0/+2
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-04	21	-65/+335
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-02	28	-1505/+1764
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-28	5	-1345/+1332
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-27	4	-1355/+1344
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-27	25	-1160/+1170
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-25	28	-63/+576
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-24	77	-14152/+14543
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-18	55	-11648/+14661
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-13	9	-824/+1347
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-12	11	-87/+154
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-09	6	-4040/+4178
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-09	30	-49/+246
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-06	29	-1494/+1604
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-05	16	-47/+278
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-04	7	-25/+139
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-02-02	22	-1930/+2609
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-31	12	-1995/+2059
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-30	8	-555/+598
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-28	1	-0/+4
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-28	3	-3/+3
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-27	35	-517/+577
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-25	11	-3177/+3198
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-24	4	-4/+11
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-22	9	-1297/+1329
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-22	17	-8/+31
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-01-21	12	-83/+76
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added auto_channel_create to config to ease registration	Haakon Meland Eriksen	2016-01-19	1	-0/+1
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #310 from einervonvielen/updated_homeinstall_instructions	Jeroen van Riet Paap	2016-03-07	2	-15/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update of readme according to the last changes	einervonvielen	2016-03-06	1	-14/+23
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	root	2016-03-06	2	-1/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of https://git...	root	2016-03-06	1	-1/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	.	Einer von Vielen	2016-01-13	1	-1/+0
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #309 from tluther/master	Jeroen van Riet Paap	2016-03-07	5	-2/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc: Minor correction cloud URL in cloud.bb	Tobias Luther	2016-03-06	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Link to TOS to EMail templates targeting members	Tobias Luther	2016-03-06	3	-0/+13
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doco: corrected git URL in git for non-developers	www-data	2016-03-06	1	-1/+1
\| \| \|_\|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	revup	redmatrix	2016-03-06	1	-1/+1
\|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /	Also make it clear with (mouse) hover text that you must click on the cover p...	jeroenpraat	2016-03-06	2	-1/+2
\|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| /	Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else it...	jeroenpraat	2016-03-06	1	-0/+1
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-03-04	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show cover-photo upload link only for the default profile	Mario Vavti	2016-03-04	1	-1/+1
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add cover photo upload link to edit profile	Mario Vavti	2016-03-04	2	-0/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	issues #306 and #307	redmatrix	2016-03-04	3	-494/+521
\|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the CHANGELOG for V1.3	redmatrix	2016-03-03	1	-0/+43