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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #429 from anaqreon/wiki	hubzilla	2016-06-21	5	-17/+550
\|\ \| \| \| \|	Wiki page revision comparison viewer
\| *	Merge branch 'dev' into wiki	Andrew Manning	2016-06-20	0	-0/+0
\| \|\
\| \| *	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev	Andrew Manning	2016-06-20	47	-1150/+22931
\| \| \|\
\| \| * \	Merge remote-tracking branch 'upstream/dev' into dev	Andrew Manning	2016-06-16	73	-553/+25128
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'upstream/dev' into dev	Andrew Manning	2016-06-15	35	-167/+392
\| \| \|\ \ \
\| \| * \| \| \|	Move Spanish context help translation from es to es-es and make es a symlink ↵	Andrew Manning	2016-06-13	15	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to es-es
\| * \| \| \| \|	Add formatted heading for revision comparison viewer	Andrew Manning	2016-06-20	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-20	42	-1139/+22890
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Do not change active page commit until user reverts the page	Andrew Manning	2016-06-20	1	-1/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/dev' into wiki	Andrew Manning	2016-06-17	6	-11/+41
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Wiki page revision comparison tool with diff displayed in modal dialog. ↵	Andrew Manning	2016-06-17	5	-17/+548
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Leverages Diff class from http://code.stephenmorley.org/php/diff-implementation with license CC0 1.0 universal http://creativecommons.org/publicdomain/zero/1.0/legalcode
* \| \| \| \| \|	last merge from master did reset the std_version to 1.8 - set it back to 1.9 ↵	Mario Vavti	2016-06-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for dev
* \| \| \| \| \|	Merge branch 'master' into dev	Mario Vavti	2016-06-20	40	-86788/+61549
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	missing backslash leading to wsod on xconfig changes	Mario Vavti	2016-06-20	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	merge conflict	redmatrix	2016-06-19	1	-6/+0
\| \| \| \| \| \|
\| * \| \| \| \|	zot_revision should be string, not float1.8	redmatrix	2016-06-19	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	recreate link from the merge kerfuffle	redmatrix	2016-06-19	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch '1.8RC'	redmatrix	2016-06-19	2861	-171567/+92849
\| \|\ \ \ \ \
\| \| * \| \| \| \|	hebrew hstrings.php was empty	redmatrix	2016-06-18	1	-0/+2317
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	hebrew update	redmatrix	2016-06-18	3	-3548/+1311
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	changelog update for 1.8	redmatrix	2016-06-17	1	-0/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	"thing" always showing default url, not that supplied by the thing.	redmatrix	2016-06-17	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge	redmatrix	2016-06-15	44	-81254/+77509
\| \| \|\ \ \ \ \
\| \| \| * \| \| \| \|	All languages up to date as far as they are updated. Added Hebrew (I saw no ↵	jeroenpraat	2016-06-15	44	-81254/+77509
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RTL on my browser, but maybe that's a locale setting or else it's not yet implemented in HZ). Removed Esperanto and Czech (they where old ones from Friendica and are not on Transifex (yet)).
\| \| * \| \| \| \| \|	translate already imported system apps	redmatrix	2016-06-15	1	-0/+2
\| \| \|/ / / / /
\| \| * \| \| \| \|	Merge branch '1.8RC' of https://github.com/redmatrix/hubzilla into 1.8RC_merge	redmatrix	2016-06-15	2	-5529/+5467
\| \| \|\ \ \ \ \
\| \| \| * \ \ \ \	Merge pull request #420 from phellmes/de20160615	Jeroen van Riet Paap	2016-06-15	2	-5529/+5467
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update DE translation strings
\| \| \| \| * \| \| \| \|	Update DE translation strings	phellmes	2016-06-15	2	-5529/+5467
\| \| \| \|/ / / / /
\| \| * / / / / /	add new connection to default group when auto-accepted	redmatrix	2016-06-15	2	-1/+11
\| \| \|/ / / / /
\| \| * \| \| \| \|	DB schema issue with import	redmatrix	2016-06-12	1	-12/+26
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #414 from anaqreon/1.8RC	hubzilla	2016-06-13	2	-16/+4
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add filter to wiki content to prevent JavaScript code injection
\| \| \| * \| \| \| \|	Apply purify_html to page content before preview and save to prevent ↵	Andrew Manning	2016-06-12	2	-16/+4
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	JavaScript code injection.
\| * \| \| \| \| \|	hebrew hstrings.php was empty	redmatrix	2016-06-18	1	-0/+2317
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #426 from eduoda/master	hubzilla	2016-06-19	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When picktime is false, close date selector on date select
\| \| * \| \| \| \| \|	When picktime is false, close date selector on date select	Oda	2016-06-18	1	-1/+1
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #424 from BlaBlaNet/master	hubzilla	2016-06-19	9	-0/+19195
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hebrew translation
\| \| * \| \| \| \| \|	hebrew translation	root	2016-06-18	9	-0/+19195
\| \|/ / / / / /
\| * \| \| \| \| \|	class object call	redmatrix	2016-06-04	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	class functions not called with an object	redmatrix	2016-06-04	1	-3/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	make init static on master also	redmatrix	2016-06-03	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	minor version roll	redmatrix	2016-05-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	issue #386 (master)	redmatrix	2016-05-16	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	be specific	redmatrix	2016-05-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge	redmatrix	2016-05-15	15	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	stupid git	jeroenpraat	2016-05-15	14	-0/+113
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	the other way around	jeroenpraat	2016-05-15	14	-113/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	roll minor version due to change	redmatrix	2016-05-15	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	issue #387	redmatrix	2016-05-15	1	-1/+2
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge pull request #382 from mjfriaza/dev	redmatrix	2016-05-15	14	-273/+58
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Another updated contextual help in Spanish
\| \| * \| \| \| \| \|	Another updated context help es-es	Manuel Jiménez Friaza	2016-05-14	14	-273/+58
\| \| \| \| \| \| \| \|