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

	Commit message (Collapse)	Author	Age	Files	Lines
*	pdo - fetch assoc only	zotlabs	2016-10-25	1	-1/+1
\|
*	set port if non-zero (instead of non-null)	zotlabs	2016-10-24	2	-2/+2
\|
*	Merge pull request #559 from zotlabs/pdo	zotlabs	2016-10-25	5	-54/+123
\|\ \| \| \| \|	Pdo DB driver
\| *	found it...	zotlabs	2016-10-23	1	-2/+2
\| \|
\| *	this seems to work, but there are unanswered questions and is still ↵	zotlabs	2016-10-23	1	-5/+8
\| \| \| \| \| \| \| \|	undergoing investigation. It appears that the data stored with os_content = 1 is not being escaped in all circumstances or the scaled image data is being escaped twice.
\| *	fetch bytea as stream	zotlabs	2016-10-23	1	-1/+2
\| \|
\| *	Merge branch 'dev' into pdo	zotlabs	2016-10-23	19	-3082/+3114
\| \|\
\| * \|	pdo hacks	zotlabs	2016-10-23	2	-4/+18
\| \| \|
\| * \|	allow a dsn override to the database via the server argument. This could be ↵	zotlabs	2016-10-20	2	-15/+21
\| \| \| \| \| \| \| \| \| \| \| \|	used to allow unix domain sockets and other unusual configurations.
\| * \|	pdo - cleanup	zotlabs	2016-10-20	1	-7/+3
\| \| \|
\| * \|	Merge branch 'dev' into pdo	zotlabs	2016-10-20	4	-36/+146
\| \|\ \
\| * \| \|	more pdo tweaks	zotlabs	2016-10-20	1	-3/+24
\| \| \| \|
\| * \| \|	pdo testing	zotlabs	2016-10-20	2	-7/+17
\| \| \| \|
\| * \| \|	use pdo for postgres also	zotlabs	2016-10-19	5	-17/+32
\| \| \| \|
\| * \| \|	pdo fixes	zotlabs	2016-10-19	1	-4/+4
\| \| \| \|
\| * \| \|	pdo changes first cut	zotlabs	2016-10-19	2	-30/+27
\| \| \| \|
\| * \| \|	Merge branch 'dev' into pdo	zotlabs	2016-10-19	83	-5111/+10022
\| \|\ \ \
\| * \| \| \|	some pdo work	zotlabs	2016-10-17	1	-6/+12
\| \| \| \| \|
* \| \| \| \|	not null violation in mail	zotlabs	2016-10-24	1	-3/+4
\| \| \| \| \|
* \| \| \| \|	some more places which require dbescbin and dbunescbin	zotlabs	2016-10-24	1	-8/+9
\| \| \| \| \|
* \| \| \| \|	profile photo issue on postgres	zotlabs	2016-10-23	2	-2/+3
\| \| \| \| \|
* \| \| \| \|	correct encoding	zotlabs	2016-10-23	2	-3/+3
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2016-10-23	5	-12/+61
\|\ \ \ \
\| * \ \ \	Merge pull request #565 from anaqreon/wiki-download	zotlabs	2016-10-23	3	-0/+35
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add wiki download button to export the selected wiki repo to a zip file
\| \| * \| \| \|	Add wiki download button to export the selected wiki repo to a zip file	Andrew Manning	2016-10-22	3	-0/+35
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #562 from fsteinel/issue-561	zotlabs	2016-10-23	2	-12/+26
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add column display_path to inserts into attachment, as this column is…
\| \| * \| \| \| \|	until we've settled on what they should be, set os_path and display_path to ↵	Florian Steinel	2016-10-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	an emtpy string
\| \| * \| \| \| \|	attach_mkdir use $os_path and $display_path initilized to an empty string	Florian Steinel	2016-10-22	1	-2/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	add column display_path to inserts into attachment, as this column is a not ↵	Florian Steinel	2016-10-22	2	-12/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	null column Conflicts: Zotlabs/Storage/Directory.php include/attach.php amend 54def92bcf75c08cd8dec3921e5ef26f23d85ffc display_path
* \| \| \| \| \| \|	need to perform dbunescbin on stored filenames as well as binary data - this ↵	zotlabs	2016-10-23	3	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	is a no-op under mysql but could provide unpredictable data under postgres
* \| \| \| \| \| \|	misplaced parens	zotlabs	2016-10-23	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2016-10-22	3	-17/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	provide lockstate for events and remove obsolete code	Mario Vavti	2016-10-22	3	-17/+3
\| \| \|/ / / / \| \|/\| \| \| \|
* / \| \| \| \|	php warning, $uplink didn't have a default	zotlabs	2016-10-22	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2016-10-21	1	-1/+1
\|\ \ \ \ \
\| * \ \ \ \	Merge pull request #563 from ilu33/dev	zotlabs	2016-10-22	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Postgres complaining again ...
\| \| * \| \| \| \|	Postgres complaining again ...	ilu33	2016-10-22	1	-1/+1
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	```sql UPDATE abook SET abook_profile = (SELECT profile_guid AS FROM profile WHERE is_default = 1 AND uid = 13 LIMIT 1) WHERE abook_profile = '' AND abook_channel = 13 ; returned false ERROR: syntax error at or near "profile" LINE 1: ... SET abook_profile = (SELECT profile_guid AS FROM profile WH... ^ ```
* \| / / / /	issue #564	zotlabs	2016-10-21	2	-2/+2
\|/ / / / /
* / / / /	squash timezone adjusted birthdays into a single day in the calendar, by ↵	zotlabs	2016-10-21	1	-0/+6
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	lying and telling the js calendar that the end date/time is unknown
* \| \| \|	better fix for navbar channel autocomplete, refrain from search until a ↵	zotlabs	2016-10-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minimum of 3 chars entered. 2 typically gives way too many results and usually low quality results.
* \| \| \|	full revert, that wasn't working at all. Not sure why.	zotlabs	2016-10-21	1	-3/+1
\| \| \| \|
* \| \| \|	partial revert	zotlabs	2016-10-21	1	-3/+2
\| \| \| \|
* \| \| \|	fine tune the navbar people autocomplete, as the check for minimum length ↵	zotlabs	2016-10-21	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	wasn't taking into consideration the initial tag character, and one char search provides way too many results. The autocomplete cache doesn't search again but just searches through its cache. This means as you type more chars, if the answer wasn't included in the very first search (one char), it won't be returned. This may need further tweaking as the network grows.
* \| \| \|	string update	zotlabs	2016-10-21	1	-3031/+3032
\| \| \| \|
* \| \| \|	remove more corporate code - https url conversion for youtube is now handled ↵	zotlabs	2016-10-20	1	-11/+1
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	by std_embeds plugin
* \| \|	Merge pull request #558 from dawnbreak/dev	zotlabs	2016-10-21	2	-28/+136
\|\ \ \ \| \| \| \| \| \| \| \|	[BUGFIX] for fromStandalonePermission().
\| * \| \|	[BUGFIX] for fromStandalonePermission().	Klaus Weidenbach	2016-10-20	2	-28/+136
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure if this method is used anywhere, but it should not have worked correctly. This should correct it. Add a unit test for this class.
* \| \|	Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge	zotlabs	2016-10-20	1	-7/+5
\|\ \ \
\| * \ \	Merge pull request #556 from dawnbreak/QA_testing	zotlabs	2016-10-20	1	-7/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	[TASK] Fix travis' phpunit execution.
\| \| * \| \|	[TASK] Fix travis' phpunit execution.	Klaus Weidenbach	2016-10-19	1	-7/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed php5.4 and php5.5 from test matrix, as they are not compatible with new phpunit releases and have reached EOL anyway.