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-04-26	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: rev update, fix autoname test "random" failure duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design added BBCODE thing in comments add cleanzero theme * master:
*	Merge pull request #265 from cvogeley/master	friendica	2012-04-26	14	-2/+999
\|\ \| \| \| \|	cleanzero theme added
\| *	duepuntozero: move community and manage link to upper right area + css fixes ↵	Christian Vogeley	2012-04-25	1	-0/+71
\| \| \| \| \| \| \| \|	to avoid breaking of design
\| *	duepuntozero: move community and manage link to upper right area + css fixes ↵	Christian Vogeley	2012-04-25	1	-2/+5
\| \| \| \| \| \| \| \|	to avoid breaking of design
\| *	added BBCODE thing in comments	Christian Vogeley	2012-04-25	1	-0/+38
\| \|
\| *	add cleanzero theme	Christian Vogeley	2012-04-25	12	-0/+885
\| \|
* \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-26	6	-6358/+6809
\|\ \
\| * \	Merge pull request #266 from simonlnu/master	Simon	2012-04-25	4	-6353/+6793
\| \|\ \ \| \| \| \| \| \| \| \|	convert stylesheets to less, and compress output css
\| \| * \|	convert stylesheets to less, and compress output css	Simon L'nu	2012-04-26	4	-6353/+6793
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
\| \| * \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-26	2	-5/+16
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: Diabook-dark more CSS fixes. * master:
\| * \| \|	Diabook-dark more CSS fixes.	Thomas Willingham	2012-04-25	2	-5/+16
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Slowly getting there.
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-25	16	-452/+151
\| \| \|\ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bug #307, explaining decentralised private photos is impossible. this turns out to be harder than I thought cleanup - make bb-buttons vanish when comment closed Esperanto at 100% again * master:
\| \| *	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-25	50	-501/+1196
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: diabook-themes: fix css to login.tpl restore qcomment selector rev update zero-themes: add bbcode-toolbar to commentbox diabook-themes: small fix Diabook-dark css fix Diabook-dark, couple of new icons, and another css fix. fix tags test with new url quattro: small week calendar view for event/birthday reminders remove html from get_birthdays() and get_events() events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id]) * master:
\| \| * \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-24	41	-601/+974
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: separate tag search from body search Esperanto at 100% again Improvements to diabook-dark move unfriend to standalone function for use in account removal more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for autocomplete of PM recips * master:
\| \| * \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-23	222	-13881/+170
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: DE strings, correction of a typo diabok-themes: fixed bug in green-wide and dark-wide diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders diabook-themes: bugfix in admin-section allow bbcode representation of html symbols such as © by wrapping in bb brackets protect jappixmini/proxy from typo check, more work on email2 connector * master:
\| \| * \ \ \	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-22	67	-294/+231
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: bug #388 - notify_comment received after post deleted don't allow non-existent themes as choices diabook-themes: bugfix diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer api: add support for StatusNet-style media param to API Add a hook * master:
\| \| * \| \| \| \|	Merge branch 'master', remote-tracking branch 'remotes/upstream/master'	Simon L'nu	2012-04-22	0	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remotes/upstream/master: DE strings update diabook-themes: comment-bbcode-bugfix * master:
* \| \| \| \| \| \|	rev update, fix autoname test "random" failure	friendica	2012-04-26	3	-32/+35
\|/ / / / / /
* \| \| \| \| \|	bug #307, explaining decentralised private photos is impossible.	friendica	2012-04-25	1	-0/+23
\| \| \| \| \| \|
* \| \| \| \| \|	this turns out to be harder than I thought	friendica	2012-04-25	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #264 from mschmitt/master	friendica	2012-04-25	2	-78/+112
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Esperanto at 100% again
\| * \| \| \| \| \|	Esperanto at 100% again	Martin Schmitt	2012-04-25	2	-78/+112
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-25	12	-12/+96
\|\\| \| \| \| \|
\| * \| \| \| \|	Merge pull request #263 from tomtom84/master	tomtom84	2012-04-24	12	-12/+96
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	diabook-themes: fix css to login.tpl
\| \| * \| \| \| \|	diabook-themes: fix css to login.tpl	tommy tomson	2012-04-25	12	-12/+96
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	cleanup - make bb-buttons vanish when comment closed	friendica	2012-04-25	14	-374/+16
\|/ / / / / /
* \| \| \| \| \|	restore qcomment selector	friendica	2012-04-24	7	-21/+35
\| \| \| \| \| \|
* \| \| \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-24	36	-94/+934
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Merge pull request #262 from tomtom84/master	friendica	2012-04-24	22	-0/+732
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	zero-themes: add bbcode-toolbar to commentbox
\| \| * \| \| \| \|	zero-themes: add bbcode-toolbar to commentbox	tommy tomson	2012-04-25	22	-0/+732
\| \|/ / / / /
\| * \| \| \| \|	diabook-themes: small fix	tommy tomson	2012-04-25	3	-8/+31
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #261 from fabrixxm/eventspage	friendica	2012-04-24	6	-82/+167
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some tweak on events page and events/bitrhdays reminder
\| \| * \| \| \| \|	quattro: small week calendar view for event/birthday reminders	Fabio Comuni	2012-04-24	2	-0/+40
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	remove html from get_birthdays() and get_events()	Fabio Comuni	2012-04-24	3	-23/+53
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	events page: set calendar start date from url (events/[year]/[month]/) and ↵	Fabio Comuni	2012-04-24	2	-60/+75
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	show event popup from url anchor (#link-[event id])
\| * \| \| \| \|	Diabook-dark css fix	Thomas Willingham	2012-04-24	1	-3/+3
\| \| \| \| \| \|
\| * \| \| \| \|	Diabook-dark, couple of new icons, and another css fix.	Thomas Willingham	2012-04-24	4	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	rev update	friendica	2012-04-24	2	-393/+150
\|/ / / / /
* / / / /	fix tags test with new url	friendica	2012-04-24	1	-2/+2
\|/ / / /
* \| \| \|	Merge https://github.com/friendica/friendica into pull	friendica	2012-04-23	30	-463/+737
\|\ \ \ \
\| * \ \ \	Merge pull request #260 from mschmitt/master	friendica	2012-04-23	9	-459/+733
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Esperanto at 100% again
\| \| * \| \| \|	Esperanto at 100% again	Martin Schmitt	2012-04-24	9	-459/+733
\| \|/ / / /
\| * \| \| \|	Merge pull request #259 from beardy-unixer/master	friendica	2012-04-23	21	-4/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Diabook-dark
\| \| * \| \| \|	Improvements to diabook-dark	Thomas Willingham	2012-04-24	21	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Still a long way to go, but some icons and a few CSS fixes
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Thomas Willingham	2012-04-24	6	-118/+203
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Merge upstream
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Thomas Willingham	2012-04-24	2106	-17706/+98887
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \|	Merge upstream
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master'	Thomas Willingham	2012-04-02	0	-0/+0
\| \| \|\ \ \ \
* \| \| \| \| \| \|	separate tag search from body search	friendica	2012-04-23	5	-20/+34
\|/ / / / / /
* \| \| \| \| \|	move unfriend to standalone function for use in account removal	friendica	2012-04-23	2	-33/+47
\| \| \| \| \| \|
* \| \| \| \| \|	more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for ↵	friendica	2012-04-23	4	-85/+156
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	autocomplete of PM recips