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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into trinidad	friendica	2015-01-06	1	-1/+1
\|\
\| *	this brings us up to date	friendica	2015-01-06	1	-1/+1
\| \|
* \|	Merge branch 'master' into trinidad	friendica	2015-01-06	1	-2/+2
\|\\|
\| *	don't let dns_get_record() "write to screen" if it errors.	friendica	2015-01-06	1	-2/+2
\| \|
* \|	Merge branch 'master' into trinidad	friendica	2015-01-06	1	-0/+17
\|\\|
\| *	Merge pull request #826 from pafcu/cache_autocomplete	RedMatrix	2015-01-07	1	-0/+17
\| \|\ \| \| \| \| \| \|	Cache autocomplete results locally (the one in the editor)
\| \| *	Cache autocomplete results locally (the one in the editor)	Stefan Parviainen	2015-01-06	1	-0/+17
\| \| \|
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-06	1	-2/+2
\|\\| \|
\| * \|	lines reversed in handle_tag()	friendica	2015-01-06	1	-2/+2
\| \| \|
* \| \|	begin the grand unification for 3.0. Start by splitting DAV into a web ↵	friendica	2015-01-06	2	-27/+156
\| \| \| \| \| \| \| \| \| \| \| \|	accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-06	3	-152/+229
\|\\| \|
\| * \|	Merge pull request #825 from einervonvielen/dev_beginning_fix	RedMatrix	2015-01-07	1	-7/+8
\| \|\ \ \| \| \| \| \| \| \| \|	Corrected errors in chapter 'Contribute your changes via github'
\| \| * \|	Corrected errors in chapter 'Contribute your changes via github'	Einer von Vielen	2015-01-06	1	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- changed commit statement - changed push statement (it pointed to the orign)
\| * \| \|	Merge branch 'pafcu-mainjsoptimize'	friendica	2015-01-06	2	-145/+221
\| \|\ \ \
\| \| * \| \|	Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into ↵	friendica	2015-01-06	2	-145/+221
\| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pafcu-mainjsoptimize Conflicts: view/js/main.js
\| \| * \| \|	Don't update fuzzy time for items in a collapsed thread to increase performance.	Stefan Parviainen	2015-01-06	1	-6/+13
\| \| \| \| \|
\| \| * \| \|	Update jquery.timeago.js to add support for dispose action	Stefan Parviainen	2015-01-06	1	-139/+208
\| \| \| \| \|
* \| \| \| \|	Merge branch 'master' into trinidad	friendica	2015-01-06	6	-6/+412
\|\\| \| \| \|
\| * \| \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-06	5	-5/+411
\| \|\ \ \ \
\| \| * \| \| \|	add some style to divgrowmore	marijus	2015-01-06	1	-1/+1
\| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge pull request #823 from einervonvielen/dev_beginning	mrjive	2015-01-06	2	-0/+405
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Step-by-step manual to debug the red matrix (php) and to contribute code
\| \| \| * \| \|	spelling	Einer von Vielen	2015-01-06	1	-2/+2
\| \| \| \| \| \|
\| \| \| * \| \|	added modification of branch	Einer von Vielen	2015-01-06	1	-53/+64
\| \| \| \| \| \|
\| \| \| * \| \|	Mainly it shows how to debug the red matrix (php) in a virtual machine and ↵	Einer von Vielen	2015-01-06	1	-0/+393
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	contribute changes via git. It will guide to the following steps: - Install a Virtual Machine - Install Apache Web Server - Install PHP, MySQL, phpMyAdmin - Fork the project on github to be able contribute - Install the RED Matrix - Debug the server via eclipse - Contribute your changes via github
\| \| \| * \| \|	Mainly it shows how to debug the red matrix (php) in a virtual machine and ↵	Einer von Vielen	2015-01-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	contribute changes via git. It will guide to the following steps: - Install a Virtual Machine - Install Apache Web Server - Install PHP, MySQL, phpMyAdmin - Fork the project on github to be able contribute - Install the RED Matrix - Debug the server via eclipse - Contribute your changes via github
\| \| * \| \| \|	Merge pull request #822 from pafcu/master	pafcu	2015-01-06	2	-4/+5
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| / \| \| \| \| \|/ \| \| \| \|/\|	Add title to bb_observer tags to further clarify a bit what's going on
\| \| \| * \|	Fix bug in readmore.js	Stefan Parviainen	2015-01-06	1	-3/+4
\| \| \| \| \|
\| \| \| * \|	Add title to bb_observer tags to further clarify a bit what's going on	Stefan Parviainen	2015-01-06	1	-1/+1
\| \| \|/ /
\| * \| \|	revup	friendica	2015-01-06	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'master' into trinidad	friendica	2015-01-05	2	-35/+48
\|\\| \| \|
\| * \| \|	regression: need float clear on manage page so footer doesn't end up floated,	friendica	2015-01-05	2	-35/+48
\| \|/ / \| \| \| \| \| \| \| \| \|	add default value to features so that features can be created that are default enabled, or modified later to default enabled without requiring a system config to accomplish this.
* \| \|	undo these bits of trinidad - we're going to do things differently	friendica	2015-01-05	4	-5/+4
\| \| \|
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-05	1	-0/+2
\|\\| \|
\| * \|	detect https coming through reverse proxy or load balancer using ↵	friendica	2015-01-05	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|	x-forwarded-proto instead of (actually in addition to testing) $_SERVER['HTTPS'] and/or $_SERVER['SERVER_PORT'] to indicate ssl is enabled
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-05	213	-15617/+4152
\|\\| \|
\| * \|	Merge https://github.com/friendica/red into pending_merge	friendica	2015-01-05	212	-15616/+4151
\| \|\ \
\| \| * \	Merge pull request #820 from pafcu/nomigrate	RedMatrix	2015-01-06	212	-15616/+4151
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Steps towards not needing jquery-migrate
\| \| \| * \|	Remove unneeded divgrow library	Stefan Parviainen	2015-01-05	4	-136/+0
\| \| \| \| \|
\| \| \| * \|	Unbreak readmore	Stefan Parviainen	2015-01-05	1	-3/+5
\| \| \| \| \|
\| \| \| * \|	Make slider less ugly	Stefan Parviainen	2015-01-05	1	-0/+2
\| \| \| \| \|
\| \| \| * \|	Remove reference to non-existing colorbox.css	Stefan Parviainen	2015-01-05	1	-1/+0
\| \| \| \| \|
\| \| \| * \|	Fix error with undefined profile_uid	Stefan Parviainen	2015-01-05	1	-0/+1
\| \| \| \| \|
\| \| \| * \|	Remove some unneeded libraries	Stefan Parviainen	2015-01-05	87	-14625/+0
\| \| \| \| \|
\| \| \| * \|	Replace fancybox with colorbox	Stefan Parviainen	2015-01-05	101	-716/+1522
\| \| \| \| \|
\| \| \| * \|	Update jGrowl	Stefan Parviainen	2015-01-05	3	-148/+4
\| \| \| \| \|
\| \| \| * \|	Replace jslider with jRange	Stefan Parviainen	2015-01-05	17	-6/+2148
\| \| \| \| \|
\| \| \| * \|	Replace divgrow with more modern readmore.js	Stefan Parviainen	2015-01-05	4	-7/+495
\| \| \|/ /
\| * / /	revup	friendica	2015-01-05	1	-1/+1
\| \|/ /
* \| \|	Merge branch 'master' into trinidad	friendica	2015-01-04	1	-1/+1
\|\\| \|
\| * \|	regression: autocomplete hovertip with url/address missing - useful for ↵	friendica	2015-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	identifying connections based on their site if they have different channels (not clones) on different sites with all other identifying info the same.