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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-25	3	-47/+45
\|\
\| *	update es-es strings	jeroenpraat	2015-12-25	3	-47/+45
\| \|
* \|	regression: default inherited permission was not being set for a connection ↵	redmatrix	2015-12-25	1	-0/+1
\|/ \| \| \|	if the permission was 'inherited'. We need to set these so that if somebody changes the top level permissions they don't have to go back and manually edit every connection to allow/deny what used to be an automatic inherited setting.
*	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-24	13	-1710/+1761
\|\
\| *	After reading and talking with experts I came to the conclusion that es-es ↵	jeroenpraat	2015-12-24	12	-23098/+1
\| \| \| \| \| \| \| \|	and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960
\| *	reverted my previous commit. this is going to be fixed remotely upstream. ↵	jeroenpraat	2015-12-23	21	-20/+1
\| \| \| \| \| \| \| \|	Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958.
\| *	Spanish language codes. See issue #234	jeroenpraat	2015-12-23	41	-0/+23117
\| \|
\| *	update es+nl strings	jeroenpraat	2015-12-22	4	-1710/+1760
\| \|
* \|	start on refactor of plugin/theme/widget info block parsing	redmatrix	2015-12-22	1	-6/+7
\|/
*	merge hell	redmatrix	2015-12-20	1	-30/+39
\|
*	Updated Norwegian strings for Hubzilla	Haakon Meland Eriksen	2015-12-20	2	-1591/+1669
\|
*	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-20	2	-841/+867
\|\
\| *	Merge pull request #230 from wave72/master	Wave	2015-12-20	2	-841/+867
\| \|\ \| \| \| \| \| \|	Updated Italian strings
\| \| *	Updated Italian strings	wave72	2015-12-20	2	-841/+867
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-18	6	-7957/+8261
\|\\| \|
\| * \|	fix search item attachment rendering	Mario Vavti	2015-12-17	1	-5/+6
\| \| \|
\| * \|	update to German strings	zottel	2015-12-16	2	-6969/+7218
\| \| \|
\| * \|	Merge pull request #222 from wave72/master	Wave	2015-12-16	2	-983/+1036
\| \|\\| \| \| \| \| \| \|	Updated Italian strings
\| \| *	Updated Italian strings	Paolo Tacconi	2015-12-16	2	-983/+1036
\| \| \|
\| * \|	Invitation only added to the admin site page. Plus css wrapper class to docu ↵	jeroenpraat	2015-12-15	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|	search.
* \| \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-14	12	-1532/+1575
\|\\| \|
\| * \|	es+nl strings update	jeroenpraat	2015-12-12	4	-1504/+1508
\| \| \|
\| * \|	some minor cleanup - change the default of the discover tab (public stream ↵	redmatrix	2015-12-10	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|	access)
\| * \|	Some work on the login, register and default home page. Mostly neatly ↵	jeroenpraat	2015-12-09	5	-20/+61
\| \| \| \| \| \| \| \| \| \| \| \|	centering things on different viewport widths. Bluegrid schema updated.
\| * \|	Fix #109.	jeroenpraat	2015-12-09	3	-3/+3
\| \| \|
\| * \|	remove some unused stuff	redmatrix	2015-12-08	1	-2/+0
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-12	1	-1/+1
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-11	1	-1/+1
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-11	1	-4/+0
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-10	1	-1/+2
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-10	1	-1/+1
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-09	1	-1/+1
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - third version	Haakon Meland Eriksen	2015-12-09	1	-6/+6
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl - second version	Haakon Meland Eriksen	2015-12-09	1	-6/+3
\| \| \|
* \| \|	Hubzilla textbox - promoting Hubzilla features in jot.tpl	Haakon Meland Eriksen	2015-12-09	1	-29/+26
\|/ /
* \|	move the diaspora templates out of core (except for diaspora_vcard, which is ↵	redmatrix	2015-12-07	15	-194/+0
\| \| \| \| \| \| \| \|	still stuck here for the present time)
* \|	update es+nl	jeroenpraat	2015-12-07	4	-752/+854
\| \|
* \|	mod_mitem.js is obsolete	Mario Vavti	2015-12-07	1	-17/+0
\| \|
* \|	some style.css janitor work	Mario Vavti	2015-12-07	2	-279/+20
\| \|
* \|	override bs default margin	Mario Vavti	2015-12-07	1	-0/+1
\| \|
* \|	make justify gallery work with more than one albums per page (eg album widget)	Mario Vavti	2015-12-07	4	-9/+9
\| \|
* \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla	Mario Vavti	2015-12-07	1	-1/+1
\|\ \
\| * \	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-06	3	-6/+6
\| \|\ \
\| * \| \|	change text "Red developers" in update failed email	redmatrix	2015-12-05	1	-1/+1
\| \| \| \|
* \| \| \|	css fixes for blockquote and code (use same padding)	Mario Vavti	2015-12-07	1	-4/+2
\| \|/ / \|/\| \|
* \| \|	fix css issue in directory	Mario Vavti	2015-12-06	3	-6/+6
\|/ /
* \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-05	1	-0/+4
\|\ \
\| * \|	Enlarge the default mail composition text area.	Andrew Manning	2015-12-04	1	-0/+4
\| \| \|
* \| \|	Updated Norwegian translation	Haakon Meland Eriksen	2015-12-05	2	-7002/+7197
\|/ /
* \|	es+nl and bluegrid update	jeroenpraat	2015-12-03	5	-13295/+13301
\| \|