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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \|	tell browser not to cache permission denied (private) photos so that after ↵	friendica	2012-05-17	2	-5/+22
\|/ \| \| \|	authenticating we don't have to fight the browser - plus more prvgroup work
*	setup delivery chain for private groups (work in progress)	friendica	2012-05-17	3	-24/+29
\|
*	bring in the much better xml parser from the original zot branch	friendica	2012-05-16	1	-0/+164
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-16	2	-2/+2
\|\
\| *	Merge pull request #301 from simonlnu/master	Simon	2012-05-16	2	-2/+2
\| \|\ \| \| \| \| \| \|	fix admin links
\| \| *	fix admin links...	Simon L'nu	2012-05-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
* \| \|	rev update	friendica	2012-05-16	2	-3/+3
\|/ /
* \|	merged from wrong project	friendica	2012-05-16	1	-4/+0
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-16	4	-18/+21
\|\ \
\| * \|	Merge pull request #300 from simonlnu/master	Simon	2012-05-16	2	-2/+2
\| \|\\| \| \| \| \| \| \|	sigh. fix dark again
\| \| *	sigh. fix dark again	Simon L'nu	2012-05-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge pull request #299 from simonlnu/master	Simon	2012-05-16	4	-16/+19
\| \|\\| \| \| \| \| \| \|	get rid of the monstrosity for .button. need to find alternate solution
\| \| *	get rid of the monstrosity for .button. need to find alternate solution	Simon L'nu	2012-05-16	4	-16/+19
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-16	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-15	7	-83/+154
\|\\|
\| *	Merge pull request #298 from simonlnu/master	Simon	2012-05-15	7	-83/+154
\| \|\ \| \| \| \| \| \|	slight re-design of wall stuff and css/font cleaning
\| \| *	slight re-design of wall stuff and css/font cleaning	Simon L'nu	2012-05-16	7	-83/+154
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-15	32	-5273/+6292
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: update tinymce to 3.5.0.1 rev update DE strings slackr drop shadows extended Allow plugins to modify the contact photo menu rev update * master:
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-14	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
* \| \|	Merge https://github.com/friendica/dir into dpull	friendica	2012-05-15	1	-0/+4
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	initial commit	friendica	2012-05-15	1	-0/+4
\| /
* \|	update tinymce to 3.5.0.1	friendica	2012-05-15	26	-4805/+5696
\| \|
* \|	rev update	friendica	2012-05-15	2	-22/+30
\| \|
* \|	DE strings	Tobias Diekershoff	2012-05-15	2	-400/+506
\| \|
* \|	slackr drop shadows extended	friendica	2012-05-14	1	-1/+15
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-14	6	-192/+215
\|\ \
\| * \	Merge pull request #297 from mexon/upstream	friendica	2012-05-14	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\|	Allow plugins to modify the contact photo menu
\| \| *	Allow plugins to modify the contact photo menu	Matthew Exon	2012-05-15	1	-1/+1
\| \| \|
\| * \|	Merge pull request #296 from simonlnu/master	Simon	2012-05-13	5	-191/+214
\| \|\ \ \| \| \| \| \| \| \| \|	finish dispy light colour fixes
\| \| * \|	finish dipsy light colour fixes	Simon L'nu	2012-05-14	5	-191/+214
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-14	2	-67/+67
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: rev update * master:
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-13	20	-252/+4973
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-theme: small fixes rename get_language() to get_browser_language() slackr drop shadows language detection library rev update * master:
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
* \| \| \|	rev update	friendica	2012-05-14	2	-47/+47
\|/ / /
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-13	2	-18/+24
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	diabook-theme: small fixes	tommy tomson	2012-05-13	2	-18/+24
\| \| \|
* \| \|	rev update	friendica	2012-05-13	2	-67/+67
\|/ /
* \|	rename get_language() to get_browser_language()	friendica	2012-05-13	4	-6/+6
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-12	22	-6589/+4277
\|\\|
\| *	Merge pull request #295 from simonlnu/master	Simon	2012-05-12	11	-54/+89
\| \|\ \| \| \| \| \| \|	css fixes; new screenshots
\| \| *	css fixes; new screenshots	Simon L'nu	2012-05-12	11	-54/+89
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	4	-391/+575
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Ĝisdatigis la esperantlingvan tradukaĵon al 100%. * master:
\| * \|	Merge pull request #294 from mschmitt/master	friendica	2012-05-12	4	-391/+575
\| \|\ \ \| \| \| \| \| \| \| \|	Esperanto at 100% again
\| \| * \|	Ĝisdatigis la esperantlingvan tradukaĵon al 100%.	Martin Schmitt	2012-05-12	4	-391/+575
\| \| \| \|
\| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-12	0	-0/+0
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-theme: fix in earthlayers diabook-theme: some fixes * master:
\| * \|	diabook-theme: fix in earthlayers	tommy tomson	2012-05-12	3	-29/+26
\| \| \|
\| * \|	diabook-theme: some fixes	tommy tomson	2012-05-12	3	-0/+519
\| \| \|
\| * \|	Merge pull request #293 from simonlnu/master	Simon	2012-05-12	8	-6152/+3105
\| \|\ \ \| \| \|/ \| \|/\|	finished migrating dispy light - maybe
\| \| *	finished migrating dispy light - maybe	Simon L'nu	2012-05-12	8	-6152/+3105
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-11	22	-323/+1737
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Darkzero - fixed notifications bar. diabook-theme: update mapquery and small fix diabook-theme: add "population density 2010"-layer to EarthLayers-box fix search/new against possible email leakage better test of email reply visibility diabook-theme:small fix moderated comment templates diabook-theme: small fix diabook-theme: include prv_message autocomplete fix PM replies after autocomplete changes add photos to PM autocomplete, improved appearance rev update diabook-theme: small fix * master: