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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into movejs	friendica	2014-01-06	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Conflicts: version.inc
* \|	move js files from core	friendica	2014-01-04	1	-11/+11
\|/
*	Merge correction	Christian Vogeley	2013-12-22	1	-3/+0
\|
*	Merge remote-tracking branch 'upstream/master' into bootstrap	Christian Vogeley	2013-12-22	1	-3/+7
\|\ \| \| \| \| \| \| \| \|	Conflicts: view/php/theme_init.php
\| *	split out widgets.css	marijus	2013-12-11	1	-0/+1
\| \|
\| *	this reduces pageloadsize by 355,93KB	marijus	2013-12-09	1	-1/+1
\| \|
\| *	Minified bootstrap css	Christian Vogeley	2013-12-08	1	-1/+1
\| \|
\| *	override bootstrap in bootstrap-red	Christian Vogeley	2013-12-08	1	-0/+1
\| \| \| \| \| \| \| \|	so theme developers are not forced to change anything
\| *	Merge branch 'bootstrap'	Christian Vogeley	2013-12-08	1	-0/+4
\| \|\
\| * \|	split conversation.css out of style.css	marijus	2013-12-04	1	-0/+1
\| \| \|
\| * \|	re-enable jquery migration tool until we sort out all the issues	friendica	2013-11-27	1	-2/+2
\| \| \|
\| * \|	create jquery-compat to hold deprecated jquery functions, load it before all ↵	friendica	2013-11-26	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \|	the dependent js scripts
\| * \|	make font-asewome optional. Also include jquery.browser in js/main.js so we ↵	friendica	2013-11-25	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \|	can turn off the migration toolkit.
\| * \|	init_groups_visitor() was still using old array of id output (not the newer ↵	friendica	2013-11-22	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	array of hash which we need for permission queries)
\| * \|	Empty commit message.	friendica	2013-11-21	1	-0/+11
\| \| \|
* \| \|	New modal dialog for item expiry	Christian Vogeley	2013-12-22	1	-1/+7
\| \|/ \|/\|
* \|	Include bootstrap	Christian Vogeley	2013-12-08	1	-3/+18
\|/
*	add rabbit and tripledes ciphers - probably need a pconfig to set the default	friendica	2013-11-11	1	-0/+2
\|
*	e2ee	friendica	2013-11-10	1	-0/+1
\|
*	Didn't finish it. Gotta' pee.	friendica	2013-11-10	1	-0/+2
\|
*	First visit http://fontawesome.io/cheatsheet/, then it's your turn. Please ↵	friendica	2013-10-08	1	-0/+1
\| \| \| \|	don't leave this for me to fix, because you'll hate it. There are a few icons we'll have to map to something appropriate - such as "matrix"; though there are some interesting options - and you can always dip into unicode if you don't find something appropriate here; though I would suggest that if you do this to create an icon-xyz class wrapper to the HTML "i" tag so that it's handled exactly the same.
*	looks like it actually needs both files.	friendica	2013-07-14	1	-0/+1
\|
*	add the jquery version, not the standalone spinner	friendica	2013-07-14	1	-1/+1
\|
*	we need to actually include spin.js or it causes issues	friendica	2013-07-14	1	-0/+1
\|
*	get rid of jquery.browser warnings by removing msie hacks in two places, ↵	friendica	2013-05-09	1	-1/+1
\| \| \| \|	live update and fancybox
*	fix prettyphoto path	friendica	2013-05-07	1	-1/+1
\|
*	Stupid mistake	Thomas Willingham	2013-04-26	1	-0/+2
\|
*	Colorbox	Thomas Willingham	2013-04-26	1	-2/+2
\|
*	Upgraded jQuery to 1.9.1, including jQuery Migrate (for the sake of keeping ↵	Olivier Migeot	2013-04-10	1	-0/+1
\| \| \| \|	old code working) and upgrade Fullcalendar (because Migrate just wasn't enough for him).
*	Implement prettyPhoto (somewhat).	Thomas Willingham	2013-03-23	1	-0/+2
\|
*	cleanup affinity tool	friendica	2013-03-03	1	-1/+1
\|
*	get rid of undefined $ error by mangling theme specific JS include order	friendica	2012-12-13	1	-2/+1
\|
*	Give the UI a little love after all the backend mods	friendica	2012-10-24	1	-0/+1
\|
*	a few minor changes	friendica	2012-08-26	1	-2/+2
\|
*	more theme modularisation and css/js management	friendica	2012-08-09	1	-0/+26