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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #308 from HaakonME/master	Jeroen van Riet Paap	2016-03-07	2	-6981/+7203
\|\ \| \| \| \| \| \| \| \|	Updated Norwegian strings for Hubzilla. @HaakonME Can you please check if this commit is correct: https://github.com/redmatrix/hubzilla/pull/308/files#diff-8844953d2396d7486ea8e8b194c1ce96
\| *	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2016-03-06	2	-1/+2
\| \|\
\| * \|	Updated Norwegian strings for Hubzilla	Haakon Meland Eriksen	2016-03-05	2	-6981/+7203
\| \| \|
* \| \|	Merge pull request #310 from einervonvielen/updated_homeinstall_instructions	Jeroen van Riet Paap	2016-03-07	1	-1/+0
\|\ \ \ \| \| \| \| \| \| \| \|	Updated readme.md for homeinstall script
\| * \ \	Merge branch 'master' of https://github.com/redmatrix/hubzilla	root	2016-03-06	1	-1/+1
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Das ist notwendig, um weiter zu arbeien. Merge branch 'master' of ↵	root	2016-03-06	1	-1/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/einervonvielen/hubzilla
\| \| * \| \|	.	Einer von Vielen	2016-01-13	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Added Link to TOS to EMail templates targeting members	Tobias Luther	2016-03-06	3	-0/+13
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Also make it clear with (mouse) hover text that you must click on the cover ↵	jeroenpraat	2016-03-06	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	photo to show the channel/more
* \| /	Mouse cursor set to pointer for coverphoto div (instead of arrow). Or else ↵	jeroenpraat	2016-03-06	1	-0/+1
\| \|/ \|/\| \| \| \| \|	it's not clear that you can click on it to show something (the channel in this case).
* \|	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	1	-0/+1
\| \|
* \|	fix jot form	Mario Vavti	2016-03-03	1	-11/+11
\| \|
* \|	slide up cover on click	Mario Vavti	2016-03-03	1	-1/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2016-03-03	2	-10/+17
\|\ \
\| * \|	UI cleanup for admin profile field management page	redmatrix	2016-03-02	1	-9/+16
\| \| \|
\| * \|	little nl string fix	Jeroen van Riet Paap	2016-03-02	1	-1/+1
\| \| \|
* \| \|	move cover-photo to template, add the ability to define a title and subtitle ↵	Mario Vavti	2016-03-03	3	-24/+76
\|/ / \| \| \| \| \| \|	(defaults to channel name and addres), move js from redbasic.js to template.
* \|	small fix to simple cover-photo	Mario Vavti	2016-03-02	2	-6/+4
\| \|
* \|	add a fade in effect to main while scrolling up cover photo	Mario Vavti	2016-03-02	1	-0/+5
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2016-03-02	3	-10/+97
\|\ \
\| * \|	sort out the with and howlong dependencies	redmatrix	2016-03-01	1	-1/+1
\| \| \|
\| * \|	profile field admin page (functional only: still needs a lot of HTML/CSS ↵	redmatrix	2016-03-01	2	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \|	cleanup)
\| * \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-03-01	10	-50/+55
\| \|\ \
\| * \| \|	Allow configuration of the display order of profile fields. This is an ↵	redmatrix	2016-03-01	1	-9/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	important piece of a more general profile configuration framework which will eventually be accessible via the admin page.
* \| \| \|	a simple cover-photo implementation for redbasic default template	Mario Vavti	2016-03-02	5	-16/+29
\| \|/ / \|/\| \|
* \| \|	fix js error and add id to field input block	Mario Vavti	2016-03-01	2	-2/+2
\| \| \|
* \| \|	fix padding	Mario Vavti	2016-03-01	1	-1/+1
\| \| \|
* \| \|	do not show empty buttons if not logged in	Mario Vavti	2016-03-01	2	-2/+2
\| \| \|
* \| \|	another resize issue	Mario Vavti	2016-03-01	1	-0/+1
\| \| \|
* \| \|	fix resize issue	Mario Vavti	2016-03-01	1	-1/+6
\| \| \|
* \| \|	move preview content outside of editor space	Mario Vavti	2016-03-01	1	-1/+2
\| \| \|
* \| \|	adjust padding	Mario Vavti	2016-03-01	1	-2/+2
\| \| \|
* \| \|	set line-height to initial	Mario Vavti	2016-03-01	1	-1/+1
\| \| \|
* \| \|	another css fix	Mario Vavti	2016-03-01	1	-1/+1
\| \| \|
* \| \|	css fixes to make jot look better with background colors or images	Mario Vavti	2016-03-01	5	-44/+42
\|/ /
* \|	provide footer bbcode	Mario Vavti	2016-02-29	1	-0/+5
\| \|
* \|	simplify profile edit button(s) and make it useful for multiple profiles	Mario Vavti	2016-02-29	2	-12/+21
\| \|
* \|	update es-es. tested it and it works now. Don't know what happened earlier.	jeroenpraat	2016-02-29	2	-1342/+1326
\| \|
* \|	revert es-es update. something went wrong. later today I will examine what.	jeroenpraat	2016-02-29	2	-84/+9767
\| \|
* \|	update es-es strings	jeroenpraat	2016-02-28	2	-9767/+84
\| \|
* \|	Merge pull request #302 from phellmes/de20160227	redmatrix	2016-02-28	2	-1342/+1326
\|\ \ \| \| \| \| \| \|	Update DE translation strings
\| * \|	Update DE translation strings	phellmes	2016-02-27	2	-1342/+1326
\| \| \|
* \| \|	update NL strings	jeroenpraat	2016-02-27	2	-1355/+1339
\|/ /
* \|	make attach_delete() return and comment out album rename functionality since ↵	Mario Vavti	2016-02-27	1	-0/+2
\| \| \| \| \| \| \| \|	this is not supported by the backend at the moment.
* \|	several photo item template fixes	Mario Vavti	2016-02-26	2	-18/+24
\| \|
* \|	provide an edit button for the profile page	Mario Vavti	2016-02-25	1	-0/+3
\| \|
* \|	we have got a button for events in the nav. no need for it in the tabs if we ↵	Mario Vavti	2016-02-25	1	-0/+1
\| \| \| \| \| \| \| \|	are local.
* \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2016-02-24	1	-6/+6
\|\ \
\| * \	Merge branch 'master' of https://github.com/redmatrix/hubzilla	jeroenpraat	2016-02-25	2	-1/+4
\| \|\ \