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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-15	1	-1/+1
\|\
\| *	fix lost $sql_extra in recent sql query changes	marijus	2014-11-15	1	-1/+1
\| \|
* \|	minor changes to support forum mode	friendica	2014-11-15	5	-2968/+2964
\| \|
* \|	doc updates	friendica	2014-11-15	152	-1591/+3305
\|/
*	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-13	1	-0/+4
\|\
\| *	Merge pull request #693 from habeascodice/master	RedMatrix	2014-11-14	1	-0/+4
\| \|\ \| \| \| \| \| \|	Add bitwise xor to db_getfunc()
\| \| *	Add bitwise xor to db_getfunc()	Habeas Codice	2014-11-13	1	-0/+4
\| \| \|
* \| \|	buttonify some design elements that had not yet been buttonified	friendica	2014-11-13	2	-7/+7
\|/ /
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-13	2	-29/+33
\|\ \
\| * \	Merge pull request #691 from dawnbreak/master	RedMatrix	2014-11-14	2	-29/+33
\| \|\ \ \| \| \| \| \| \| \| \|	Changed two strange looking places in boot.php.
\| \| * \|	Fixed a variable conflict in mod/xchan.php.	Klaus Weidenbach	2014-11-14	2	-11/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A variable $rr inside the foreachs was used twice. Add translation to mod/xchan.php.
\| \| * \|	Changed two strange looking places in boot.php.	Klaus Weidenbach	2014-11-13	1	-19/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There have been two places that looked wrong, but I don't know how I can test them. So please review and test if I am not wrong.
* \| \| \|	mysql driver - in debug mode for statements that return true/false report ↵	friendica	2014-11-13	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	the sql along with the result so we can match it to an offending statement. This has bugged me for some time but never got around to fixing it until now.
* \| \|	put timeout code in place but don't turn it on.	friendica	2014-11-13	2	-13/+16
\| \| \|
* \| \|	Merge pull request #692 from habeascodice/master	RedMatrix	2014-11-14	1	-1/+1
\|\ \ \ \| \| \|/ \| \|/\|	missed during merge
\| * \|	violates new sql standards	Habeas Codice	2014-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	missed during merge
* \| \|	Merge pull request #690 from habeascodice/master	RedMatrix	2014-11-14	110	-645/+2258
\|\\| \| \| \|/ \|/\|	Initial postgres support
\| *	Merge remote-tracking branch 'upstream/master'	Habeas Codice	2014-11-13	197	-11360/+17155
\| \|\ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php
* \|	update nl	Jeroen	2014-11-13	2	-2470/+2601
\| \|
* \|	let's try this without a timeout	friendica	2014-11-13	2	-5/+5
\| \|
* \|	make it a bit personal	friendica	2014-11-12	1	-3/+3
\| \|
* \|	ok, I think I'll give it a break now.	friendica	2014-11-12	1	-6/+8
\| \|
* \|	minor word tweaks	friendica	2014-11-12	1	-3/+3
\| \|
* \|	populate initial ACL before the ajax loader gets called, just in case the ↵	friendica	2014-11-12	1	-1/+3
\| \| \| \| \| \| \| \|	form is submitted before it completes. Related to issue #615
* \|	this should make all the 'sys' webpage design tools useable by the admin	friendica	2014-11-12	4	-156/+211
\| \|
* \|	wordsmith	friendica	2014-11-12	1	-1/+1
\| \|
* \|	more minor wordsmithing	friendica	2014-11-12	1	-2/+2
\| \|
* \|	Some dates couldn't be verified without going way back in the archives so at ↵	friendica	2014-11-12	1	-3/+3
\| \| \| \| \| \| \| \|	least make this document accurate based on what I have in front of me.
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-12	2	-206/+290
\|\ \
\| * \	Merge pull request #689 from dawnbreak/docu	RedMatrix	2014-11-13	2	-206/+290
\| \|\ \ \| \| \| \| \| \| \| \|	Some Doxygen documentation.
\| \| * \|	Some Doxygen documentation.	Klaus Weidenbach	2014-11-13	2	-206/+290
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Add some more Doxygen formating for boot.php and dba_driver.php. Cleaning a bit up, too.
* \| \|	add history link	friendica	2014-11-12	1	-0/+1
\| \| \|
* \| \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-12	3	-19/+9
\|\\| \|
\| * \|	make search and advanced search use the same input form	marijus	2014-11-12	3	-19/+9
\| \| \|
* \| \|	History of RedMatrix, Friendica, Mike Macgirvin, and associated other stuff.	friendica	2014-11-12	1	-0/+48
\| \| \|
* \| \|	sys edit ability to menus and menu items	friendica	2014-11-12	2	-60/+96
\|/ /
* \|	extend sys support to layouts	friendica	2014-11-12	4	-132/+212
\| \|
* \|	uid not set in webpages.php, start on editwebpage.php	friendica	2014-11-11	2	-38/+72
\| \|
* \|	cleanup	friendica	2014-11-11	4	-40/+55
\| \|
* \|	slow progress on sys publishing, making sure all the data we need is in the ↵	friendica	2014-11-11	4	-10/+25
\| \| \| \| \| \| \| \|	places we need it but validate it anyway
* \|	some more work on sys publishing	friendica	2014-11-11	2	-33/+40
\| \|
* \|	a couple of places where we need to look for a sys channel euid.	friendica	2014-11-11	2	-10/+25
\| \|
* \|	and urlencode that.	friendica	2014-11-11	1	-2/+2
\| \|
* \|	Most directory searches are POST. get_query_args() only handles GET so that ↵	friendica	2014-11-11	1	-1/+9
\| \| \| \| \| \| \| \|	had to be fixed or page 2 of directory search results wouldn't match the search.
* \|	Nothing here, move along.	friendica	2014-11-11	1	-2/+2
\| \|
* \|	add some subtle delineation to directory entries, remove forced link on ↵	friendica	2014-11-11	3	-2/+5
\| \| \| \| \| \| \| \|	homepage element (SECURITY)
* \|	some work on directory widgets	marijus	2014-11-11	6	-57/+38
\| \|
* \|	tie the narrow nav-pills to .widget instead of aside	marijus	2014-11-11	2	-4/+5
\| \|
* \|	the code is a bit crufty, but this should fix issue #687	friendica	2014-11-11	3	-4/+27
\| \|
* \|	Merge https://github.com/friendica/red into pending_merge	friendica	2014-11-10	3	-32/+28
\|\ \