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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-25	0	-0/+0
\| \| \| \| \| \| \|	* remotes/upstream/master: typo datarry -> datarray * master:
*	Merge pull request #167 from unary/typo	Simon	2012-03-25	1	-1/+1
\|\ \| \| \| \|	typo datarry -> datarray
\| *	typo datarry -> datarray	Michael Johnston	2012-03-25	1	-1/+1
\| \|
* \|	Merge pull request #169 from simonlnu/master	Simon	2012-03-25	6	-14/+44
\|\ \ \| \| \| \| \| \|	search box
\| * \|	add in the search box	Simon L'nu	2012-03-25	6	-13/+43
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-25	6	-2/+22
\| \|\ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: theme screenshots * master:
* \| \|	Merge branch 'pull'	friendica	2012-03-25	3	-9/+17
\|\ \ \
* \| \| \|	theme screenshots	friendica	2012-03-25	6	-2/+22
\| \| \| \|
\| \| * \|	minor fix to dispy theme.php	Simon L'nu	2012-03-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-25	0	-0/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: * master:
\| * \|	Merge pull request #168 from simonlnu/master	Simon	2012-03-25	1	-1/+1
\| \|\ \ \| \| \|/ \| \|/\|	fix dispy-dark
\| \| *	urgent fix to dispy-dark theme.php	Simon L'nu	2012-03-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-25	0	-0/+0
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: small fixes enotify plugin hook NOTIFY_SYSTEM * master:
\| *	small fixes	tommy tomson	2012-03-25	2	-8/+16
\|/
*	enotify plugin hook	friendica	2012-03-25	1	-2/+24
\|
*	NOTIFY_SYSTEM	friendica	2012-03-25	2	-1/+9
\|
*	Merge pull request #166 from simonlnu/master	Simon	2012-03-25	19	-18/+455
\|\ \| \| \| \|	fpostit; up versions to 1.0;
\| *	dispy-dark not experimental. start implementing fpostit	Simon L'nu	2012-03-25	19	-16/+452
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-25	12	-36/+152
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: move community_pages to right_aside, fixes in css improved the inivitations and added a bit of sales pitch. * master:
* \|	Merge pull request #165 from tomtom84/master	tomtom84	2012-03-24	10	-29/+135
\|\ \ \| \| \| \| \| \|	fixes in diabook-derivates
\| * \|	move community_pages to right_aside, fixes in css	tommy tomson	2012-03-25	10	-29/+135
\|/ /
* \|	Merge branch 'pull'	friendica	2012-03-24	8	-38/+105
\|\ \
\| * \	Merge pull request #164 from simonlnu/master	Simon	2012-03-24	8	-38/+105
\| \|\ \ \| \| \| \| \| \| \| \|	implement filer/file-as
* \| \| \|	improved the inivitations and added a bit of sales pitch.	friendica	2012-03-24	2	-7/+17
\|/ / /
\| \| *	increase version to 1.0 for dispys \o/	Simon L'nu	2012-03-25	2	-2/+3
\| \|/ \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| *	implement filer/file-as	Simon L'nu	2012-03-25	8	-38/+105
\| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-25	2	-9/+15
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bug #329 - compress the plugin list on the friendica info page bug #346 - add oembed maxwidth to oembed request * master:
* \|	bug #329 - compress the plugin list on the friendica info page	friendica	2012-03-24	1	-7/+12
\| \|
* \|	bug #346 - add oembed maxwidth to oembed request	friendica	2012-03-24	1	-2/+3
\| \|
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-24	42	-122/+5673
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: prevent duplicate friend suggestions block filed items from deletion add the bang network filter is now a permission group small fix in css add right_aside to diabook-blue add connectable services to right_aside add PostIt to right_aside, fixes in css * master:
* \|	prevent duplicate friend suggestions	friendica	2012-03-24	2	-1/+10
\| \|
* \|	block filed items from deletion	friendica	2012-03-24	2	-4/+4
\| \|
* \|	add the bang	friendica	2012-03-24	1	-2/+2
\| \|
* \|	Merge branch 'pull'	friendica	2012-03-24	4	-4/+4
\|\ \
\| * \|	small fix in css	tommy tomson	2012-03-24	4	-4/+4
\| \| \|
* \| \|	network filter is now a permission group	friendica	2012-03-24	2	-2/+16
\|/ /
* \|	Merge pull request #163 from tomtom84/master	tomtom84	2012-03-24	20	-94/+5443
\|\ \ \| \| \| \| \| \|	fixes in diabook-derivates
\| * \|	add right_aside to diabook-blue	tommy tomson	2012-03-24	20	-94/+5443
\|/ /
* \|	Merge pull request #162 from tomtom84/master	tomtom84	2012-03-23	10	-3/+19
\|\ \ \| \| \| \| \| \|	fixes in theme diabook
\| * \|	add connectable services to right_aside	tommy tomson	2012-03-24	10	-3/+19
\|/ /
* \|	Merge pull request #161 from tomtom84/master	tomtom84	2012-03-23	10	-17/+180
\|\ \ \| \| \| \| \| \|	fixes in theme diabook
\| * \|	add PostIt to right_aside, fixes in css	tommy tomson	2012-03-24	10	-17/+180
\|/ /
\| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-03-23	43	-127/+5589
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: (25 commits) diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) user settings: don't show emoticons fix in css right_aside small fix fix 1024resolution add right_aside to theme diabook ability to change tags in edited posts normalise comparison link on delegation page quattro(-green) styling the 'filed under: remove' text it's only item.filer ;-) non static filer text new lines removed removed some new lines to cut down number of changed files removed unneccessary stuff removed problem from previous commit tests for the template engine adding filer functionality to quattro(-green) missing tooltip for "file as" prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms add file_as-option to diabook-derivates ... * master:
* \|	Merge pull request #160 from fabrixxm/master	tomtom84	2012-03-23	5	-223/+86
\|\ \ \| \| \| \| \| \|	work on diabook theme and settings
\| * \|	diabook: theme.php	Fabio Comuni	2012-03-23	3	-221/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)
\| * \|	user settings: don't show emoticons	Fabio Comuni	2012-03-23	2	-2/+7
\| \| \|
\| * \|	Merge remote-tracking branch 'friendica/master'	Fabio Comuni	2012-03-23	14	-20/+5280
\| \|\ \ \| \|/ / \|/\| \|
* \| \|	fix in css right_aside	tommy tomson	2012-03-23	5	-34/+4953
\| \| \|
* \| \|	small fix	tommy tomson	2012-03-23	1	-1/+1
\| \| \|
* \| \|	Merge pull request #159 from tomtom84/master	tomtom84	2012-03-22	2	-14/+15
\|\ \ \ \| \| \| \| \| \| \| \|	fixes in theme diabook