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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Set accept permissions to that of role so if you change to a custom role you ↵	redmatrix	2015-12-25	1	-1/+1
\| \| \| \|	don't start with nothing.
*	don't send wall-post notifications when creating webpages on another channel	redmatrix	2015-12-25	1	-1/+1
\|
*	spelling	redmatrix	2015-12-25	1	-1/+1
\|
*	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	3	-7/+4
\|/ \| \| \|	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
\| \|
* \|	issue #235	redmatrix	2015-12-24	2	-2/+2
\| \|
* \|	start on refactor of plugin/theme/widget info block parsing	redmatrix	2015-12-22	3	-15/+16
\|/
*	make the queue api accessible to addons	redmatrix	2015-12-21	2	-2/+8
\|
*	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-20	1	-0/+1
\|\
\| *	Merge pull request #232 from wave72/master	redmatrix	2015-12-21	1	-0/+1
\| \|\ \| \| \| \| \| \|	Added 'invitation_only' to site info
\| \| *	Added 'invitation_only' to site info	wave72	2015-12-20	1	-0/+1
\| \| \|
\| \| *	Merge pull request #4 from redmatrix/master	Wave	2015-12-20	716	-138586/+51589
\| \| \|\ \| \| \|/ \| \|/\|	Merge master into dev branch
* \| \|	merge hell	redmatrix	2015-12-20	4	-42/+50
\| \| \|
* \| \|	Merge branch 'HaakonME-master'	redmatrix	2015-12-20	6	-2480/+2575
\|\ \ \
\| * \| \|	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	8	-1571/+1633
\| \|\\| \|
\| \| * \|	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
\| \| \|
* \| \|	use realpath to bypass symlinks and check actually directory	redmatrix	2015-12-18	2	-1/+11
\| \| \|
* \| \|	allow widget 'packages' as well as individual files	redmatrix	2015-12-18	1	-2/+7
\| \| \|
* \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-18	14	-197/+173
\|\ \ \
* \| \| \|	sql delete with limit	redmatrix	2015-12-18	4	-728/+749
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'upstream/master'	Haakon Meland Eriksen	2015-12-18	429	-98157/+8997
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	update smarty to 3.1.28 stable	Mario Vavti	2015-12-18	14	-197/+173
\|/ / /
* \| \|	loop detection	redmatrix	2015-12-17	2	-5/+12
\| \| \|
* \| \|	more work on media uploads via api	redmatrix	2015-12-17	2	-9/+27
\| \| \|
* \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-17	11	-104/+116
\|\ \ \
\| * \| \|	fix search item attachment rendering	Mario Vavti	2015-12-17	1	-5/+6
\| \| \| \|
\| * \| \|	Merge pull request #227 from zzottel/master	zzottel	2015-12-17	4	-0/+87
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	add forgotten German docs
\| \| * \ \	Merge remote-tracking branch 'upstream/master'	zottel	2015-12-17	0	-0/+0
\| \| \|\ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge pull request #226 from zzottel/master	zzottel	2015-12-17	6	-99/+23
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	help files
\| \| \| * \| \|	add forgotten German docs	zottel	2015-12-17	4	-0/+87
\| \| \|/ / /
\| \| * \| \|	small fixes to English docs	zottel	2015-12-17	3	-7/+6
\| \| \| \| \|
\| \| * \| \|	reorganize German docs to fit the new docs structure	zottel	2015-12-17	3	-92/+17
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	fix mentions of RedMatrix
* / / /	issue #228	redmatrix	2015-12-17	2	-3/+3
\|/ / /
* \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-16	6	-58/+75
\|\ \ \
\| * \ \	Merge pull request #225 from zzottel/master	redmatrix	2015-12-17	6	-58/+75
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	help files
\| \| * \| \|	small fixes in English help files	zottel	2015-12-16	3	-5/+5
\| \| \| \| \|
\| \| * \| \|	updates to some German help files	zottel	2015-12-16	3	-53/+70
\| \| \| \| \|
* \| \| \| \|	queue/notification/delivery refactor continued	redmatrix	2015-12-16	5	-241/+119
\|/ / / /
* \| \| \|	Merge https://github.com/redmatrix/hubzilla into pending_merge	redmatrix	2015-12-16	5	-7953/+8255
\|\\| \| \|
\| * \| \|	Merge pull request #224 from zzottel/master	zzottel	2015-12-16	2	-6969/+7218
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	update to German strings
\| \| * \| \|	update to German strings	zottel	2015-12-16	2	-6969/+7218
\| \|/ / /
\| * \| \|	Merge pull request #223 from zzottel/master	zzottel	2015-12-16	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	remove directory red.zottel.red, add hubzilla.zottel.net instead