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/redmatrix into pending_merge	redmatrix	2015-08-17	6	-302/+302
\|\ \| \| \| \| \| \| \| \|	Conflicts: view/nl/messages.po
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-17	3	-329/+329
\| \|\
\| \| *	Replaced Dutch po file by Spanish po file by accident. Had no visible impact.	jeroenpraat	2015-08-17	1	-2075/+2071
\| \| \|
\| \| *	Final Spanish strings for now	jeroenpraat	2015-08-17	2	-297/+297
\| \| \|
\| \| *	Fixed Spanish strings	jeroenpraat	2015-08-17	1	-2103/+2107
\| \| \|
\| * \|	commit 631eb4b broke the checkboxes in admin/site, so separate normal ↵	redmatrix	2015-08-17	4	-5/+5
\| \|/ \| \| \| \| \| \|	checkboxes from bulk edit checkboxes in the css
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	3	-10/+15
\|\\|
\| *	issue #386 - account and channel bulk edit checkboxes not visible and ↵	redmatrix	2015-08-16	3	-10/+15
\| \| \| \| \| \| \| \|	therefore not useable. Also change wording to remove the offensive 'user' designation.
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-16	5	-4/+37
\|\\|
\| *	add DB support for tasks, todo items and repeating events	redmatrix	2015-08-16	5	-4/+37
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-14	5	-23/+21
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/zot.php util/messages.po
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-14	3	-31/+20
\| \|\
\| \| *	Merge pull request #385 from solstag/commentperm	redmatrix	2015-08-15	1	-14/+3
\| \| \|\ \| \| \| \| \| \| \| \|	Actually work out comment perms in zot.php (badly attempted at 36b5f6ac)
\| \| \| *	Properly fix which perms get checked for comments, Mike's solution	Alexandre Hannud Abdo	2015-08-14	1	-14/+3
\| \| \|/
\| \| *	update spanish	jeroenpraat	2015-08-14	2	-17/+17
\| \| \|
\| * \|	set email verified if lost password workflow is completed to avoid the ↵	redmatrix	2015-08-14	3	-36/+37
\| \|/ \| \| \| \| \| \|	situation where they can reset the password but still not be able to login because the original email verification was lost.
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-12	11	-11288/+19619
\| \|\
\| * \|	revert 36b5f6ac	redmatrix	2015-08-12	2	-13/+15
\| \| \|
* \| \|	add item validation function	redmatrix	2015-08-13	2	-19/+34
\| \| \|
* \| \|	attach_store needs a lot of documenting to understand what's going on and ↵	redmatrix	2015-08-13	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \|	how it got to be this way. Here's the bird's eye view.
* \| \|	reverting 36b5f6ac	redmatrix	2015-08-12	1	-11/+18
\| \| \|
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-12	12	-11288/+19624
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Conflicts: view/es/htconfig.tpl view/es/update_fail_eml.tpl
\| * \|	Some corrections of Spanish strings.	jeroenpraat	2015-08-12	2	-135/+136
\| \| \|
\| * \|	And Catalan!	jeroenpraat	2015-08-12	2	-6006/+9675
\| \| \|
\| * \|	Thanks to Manuel. Updated Spanish to 100 procent.	jeroenpraat	2015-08-12	9	-5281/+9942
\| \|/
* \|	resolve conflict	redmatrix	2015-08-11	1	-56/+6
\| \|
* \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-11	4	-11/+72
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/history.md mod/import.php
\| *	doc fixes	redmatrix	2015-08-11	2	-9/+9
\| \|
\| *	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-11	1	-1/+11
\| \|\
\| \| *	Merge pull request #383 from solstag/commentpermgood	redmatrix	2015-08-12	1	-1/+11
\| \| \|\ \| \| \| \| \| \| \| \|	Require comment perms only for own posts, allow senders to deliver co…
\| \| \| *	Require comment perms only for own posts, allow senders to deliver comments ↵	Alexandre Hannud Abdo	2015-08-10	1	-1/+11
\| \| \|/ \| \| \| \| \| \| \| \| \|	using stream perms.
\| * \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-10	2	-12/+17
\| \|\\|
\| * \|	convert abook_flags from hubzilla during cloning	redmatrix	2015-08-10	2	-5/+31
\| \| \|
* \| \|	more consistent output on forum widget	redmatrix	2015-08-11	1	-5/+27
\| \| \|
* \| \|	remove the forum limit	redmatrix	2015-08-11	2	-2/+2
\| \| \|
* \| \|	arghh	redmatrix	2015-08-11	1	-1/+1
\| \| \|
* \| \|	typo	redmatrix	2015-08-11	1	-1/+1
\| \| \|
* \| \|	wrong cid	redmatrix	2015-08-11	1	-2/+3
\| \| \|
* \| \|	don't show '0' results, like notifications	redmatrix	2015-08-11	1	-1/+1
\| \| \|
* \| \|	order by name	redmatrix	2015-08-11	1	-1/+1
\| \| \|
* \| \|	make sure we only get forums attached to the channel	redmatrix	2015-08-11	1	-8/+2
\| \| \|
* \| \|	set font-weight back to normal on forums widget	redmatrix	2015-08-11	1	-1/+1
\| \| \|
* \| \|	Merge https://github.com/redmatrix/redmatrix into pending_merge	redmatrix	2015-08-11	2	-1/+2
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: include/items.php util/messages.po view/nl/messages.po view/nl/strings.php
\| * \|	Update Dutch strings	jeroenpraat	2015-08-09	2	-12/+17
\| \|/
\| *	ensure diaspora_signature is converted to json before we store it.	redmatrix	2015-08-08	3	-11/+18
\| \|
* \|	forum widget	redmatrix	2015-08-11	2	-4/+5
\| \|
* \|	untested forum widget	redmatrix	2015-08-11	1	-1/+39
\| \|
* \|	bring back colour to abook_self in acl	redmatrix	2015-08-11	2	-7/+7
\| \|
* \|	private mail isues	redmatrix	2015-08-09	2	-6/+8
\| \|
* \|	convert diaspora_signature to json for storage	redmatrix	2015-08-08	1	-0/+3
\| \|