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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of github.com:annando/friendica	Michael	2012-05-19	915	-87935/+37921
\|\
\| *	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-19	26	-665/+1036
\| \|\
\| \| *	backend support for 'x' deliveries per process - x is configurable, more ↵	friendica	2012-05-19	3	-377/+394
\| \| \| \| \| \| \| \| \| \| \| \|	importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
\| \| *	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-19	4	-5/+5
\| \| \|\
\| \| \| *	Merge pull request #302 from simonlnu/master	Simon	2012-05-19	4	-5/+5
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \|	fix -desc again
\| \| \| \| *	fix -desc again	Simon L'nu	2012-05-19	4	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-19	3	-246/+266
\| \| \| \| \|\ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: profile change activity link bug * master:
\| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-18	16	-40/+183
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: apply max-width to images in posts, duepuntozero theming for default group selector catch more places to apply default group make it difficult to setup a private forum with no privacy more private forums, default privacy group for new contacts tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work * master:
\| \| \| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-17	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: setup delivery chain for private groups (work in progress) bring in the much better xml parser from the original zot branch rev update merged from wrong project initial commit * master:
\| \| * \| \| \|	sql script to ccnvert all tables to innodb	friendica	2012-05-19	1	-0/+19
\| \| \|/ / /
\| \| * \| /	profile change activity link bug	friendica	2012-05-18	3	-246/+266
\| \| \| \|/ \| \| \|/\|
\| \| * \|	apply max-width to images in posts, duepuntozero	friendica	2012-05-18	1	-0/+5
\| \| \| \|
\| \| * \|	theming for default group selector	friendica	2012-05-18	4	-4/+9
\| \| \| \|
\| \| * \|	catch more places to apply default group	friendica	2012-05-18	1	-0/+10
\| \| \| \|
\| \| * \|	make it difficult to setup a private forum with no privacy	friendica	2012-05-17	1	-4/+13
\| \| \| \|
\| \| * \|	more private forums, default privacy group for new contacts	friendica	2012-05-17	13	-34/+131
\| \| \| \|
\| \| * \|	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 https://github.com/friendica/dir into dpull	friendica	2012-05-15	1	-0/+4
\| \| \|\ \
\| \| \| * \|	initial commit	friendica	2012-05-15	1	-0/+4
\| \| \| /
\| * \| \|	Merge remote branch 'upstream/master'	Michael Vogel	2012-05-16	109	-12544/+17543
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	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:
\| \| * \|	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
\| \| \| \| \| \|
\| \| * \| \| \|	rev update	friendica	2012-05-14	2	-47/+47
\| \| \| \| \| \|
\| \| \| \| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-14	0	-0/+0
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| \| \| * \|	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 https://github.com/friendica/friendica into pull	friendica	2012-05-13	2	-18/+24
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|