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

	Commit message (Collapse)	Author	Age	Files	Lines
*	more theme cleanup	friendica	2012-05-28	4	-2/+24
\|
*	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-28	11	-294/+172
\|\
\| *	Merge pull request #315 from simonlnu/master	Simon	2012-05-28	11	-294/+172
\| \|\ \| \| \| \| \| \|	fixed font-size/line-height stuffs
\| \| *	fixed font-size/line-height stuffs	Simon L'nu	2012-05-28	11	-294/+172
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-28	11	-76/+168
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: slackr - tone down the shadows a smidgin add plugin hooks to gender, sexpref, and marital selectors birthday in november,december bug rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. handle multiple underscores in D* links * master:
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-26	3	-88/+89
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: more ssl policy stuff allow force ssl on notifications * master:
\| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-26	12	-499/+543
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: missing entries on personal tab after sql text search optimise bug #434 - default group placement not working after accepting dfrn friend request fix wall_uploaded photo permissions on group post by member improve location change notifications keep private FB stuff out of personal notes rev update DE update to strings and templates * master:
\| \| * \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-24	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: fix small js error when user not logged in install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect * master:
* \| \| \| \|	rev update	friendica	2012-05-28	3	-202/+202
\|/ / / /
* \| \| \|	slackr - tone down the shadows a smidgin	friendica	2012-05-27	1	-4/+9
\| \| \| \|
* \| \| \|	add plugin hooks to gender, sexpref, and marital selectors	friendica	2012-05-27	1	-0/+7
\| \| \| \|
* \| \| \|	birthday in november,december bug	friendica	2012-05-27	1	-2/+2
\| \| \| \|
* \| \| \|	rework the way private photos are embedded to avoid url differences and also ↵	friendica	2012-05-27	6	-69/+142
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check the permissions if possible to make sure that nothing sneaks by.
* \| \| \|	handle multiple underscores in D* links	friendica	2012-05-26	2	-1/+8
\| \|_\|/ \|/\| \|
* \| \|	more ssl policy stuff	friendica	2012-05-26	1	-15/+12
\| \| \|
* \| \|	allow force ssl on notifications	friendica	2012-05-26	3	-73/+77
\| \|/ \|/\|
* \|	missing entries on personal tab after sql text search optimise	friendica	2012-05-25	2	-7/+6
\| \|
* \|	bug #434 - default group placement not working after accepting dfrn friend ↵	friendica	2012-05-25	1	-1/+1
\| \| \| \| \| \| \| \|	request
* \|	fix wall_uploaded photo permissions on group post by member	friendica	2012-05-25	1	-1/+3
\| \|
* \|	improve location change notifications	friendica	2012-05-25	1	-1/+10
\| \|
* \|	keep private FB stuff out of personal notes	friendica	2012-05-25	3	-39/+50
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-25	10	-444/+450
\|\ \
\| * \|	DE update to strings and templates	Tobias Diekershoff	2012-05-25	3	-397/+419
\| \|/
\| *	Merge pull request #313 from fabrixxm/master	Simon	2012-05-24	3	-5/+7
\| \|\ \| \| \| \| \| \|	install wizard: fix php executable path
\| \| *	fix small js error when user not logged in	root	2012-05-24	1	-1/+1
\| \| \|
\| \| *	install wizard: fix php executable path	root	2012-05-24	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect
\| * \|	Merge pull request #314 from simonlnu/master	Simon	2012-05-24	4	-42/+24
\| \|\ \ \| \| \| \| \| \| \| \|	update dark a bit. i messed up some buttons
\| \| * \|	update dark a bit. i messed up some buttons	Simon L'nu	2012-05-24	4	-42/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-24	0	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: slackr: improve interactivity slackr: hide calendar when posting more theme stuff * master:
* / /	rev update	friendica	2012-05-25	4	-89/+90
\|/ /
* \|	slackr: improve interactivity	friendica	2012-05-23	1	-0/+14
\| \|
* \|	slackr: hide calendar when posting	friendica	2012-05-23	1	-0/+8
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-23	4	-39/+70
\|\ \
\| * \	Merge pull request #312 from simonlnu/master	Simon	2012-05-23	4	-39/+70
\| \|\ \ \| \| \| \| \| \| \| \|	a few more fixes
\| \| * \|	clean up and more fixing	Simon L'nu	2012-05-23	4	-39/+70
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-23	3	-151/+174
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: slackr - better highlighting of current selections slackr - knock the sharp edges off the events calendar rev update * master:
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-23	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section * master:
* \| \| \|	more theme stuff	friendica	2012-05-23	3	-1/+56
\|/ / /
* \| \|	slackr - better highlighting of current selections	friendica	2012-05-23	1	-1/+6
\| \| \|
* \| \|	slackr - knock the sharp edges off the events calendar	friendica	2012-05-23	1	-1/+1
\| \| \|
* \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-05-23	12	-137/+278
\|\\| \|
\| * \|	Merge pull request #309 from fabrixxm/master	Simon	2012-05-23	4	-38/+56
\| \|\\| \| \| \| \| \| \|	Update install wizard
\| \| *	Update install wizard	root	2012-05-23	4	-38/+56
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section
\| * \|	Merge pull request #311 from simonlnu/master	Simon	2012-05-23	5	-64/+164
\| \|\ \ \| \| \| \| \| \| \| \|	clean up and fixing things
\| \| * \|	clean up and make nice the dispy photo edit stuff	Simon L'nu	2012-05-23	5	-64/+164
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-23	0	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \|	Merge pull request #310 from simonlnu/master	Simon	2012-05-23	7	-35/+58
\| \|\ \ \| \| \|/ \| \|/\|	add a placeholder attribute on #search-text; dispy fixes
\| \| *	add a placeholder attribute on search-text; dispy fixes	Simon L'nu	2012-05-23	7	-35/+58
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-23	19	-269/+417
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: photo rotation event calendar theming import quattro event reminder mark bubbles unsupported keep FB out of private notes clear submanage, etc from session on logout if identity (uid) changes - reload any other open browser windows on next ping. * master:
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-05-22	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Oops - but lets commit the right revision, sorry. There's a spare line in the last one. Fix darkzero/ns BB icon background colours. cause of bogus wall-to-wall posts found add queue totals to admin summary page DE: update to the strings and some mail templates fix setting array values to config items redir links for permission controlled attachments * master: