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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master'	zottel	2014-02-19	33	-349/+1949
\|\
\| *	introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is ↵	friendica	2014-02-18	6	-22/+84
\| \| \| \| \| \| \| \|	able to successfully authenticate (but is not necessarily in this network).
\| *	fix zrl bookmarks which broke with this checkin: c9192991c95a5145	friendica	2014-02-18	1	-27/+6
\| \| \| \| \| \| \| \| \| \| \| \|	It was documented that: Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible. but as that was in a different function it was easy to overlook.
\| *	Merge https://github.com/friendica/red into zpull	friendica	2014-02-18	1	-2/+5
\| \|\
\| \| *	Merge pull request #320 from dawnbreak/master	friendica	2014-02-19	1	-2/+5
\| \| \|\ \| \| \| \| \| \| \| \|	Let user cancel the red_encrypt dialogue
\| \| \| *	Let user cancel the red_encrypt dialogue	Klaus	2014-02-18	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|	If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
\| * \| \|	change edit/delete to icons on filestorage page	friendica	2014-02-18	1	-3/+4
\| \|/ /
\| * \|	some more snakebite and fix up include/account - forgot about that inline ↵	friendica	2014-02-18	4	-21/+57
\| \| \| \| \| \| \| \| \| \| \| \|	array stuff
\| * \|	service class downgrade to the default service class on account expiration ↵	friendica	2014-02-18	2	-10/+55
\| \| \| \| \| \| \| \| \| \| \| \|	if using a non-default service class and account has expired.
\| * \|	edit bookmarks	friendica	2014-02-18	7	-7/+18
\| \| \|
\| * \|	get_theme_uid() - if no uid, look for a system channel and use that. This ↵	friendica	2014-02-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \|	allows default theme/scheme tweaks at the server level.
\| * \|	update the donation link	friendica	2014-02-17	2	-4/+4
\| \| \|
\| * \|	remove the exit clause	friendica	2014-02-17	1	-6/+0
\| \| \|
\| * \|	snakebite, cont. magic-auth via openid is now possible, with the caveat that ↵	friendica	2014-02-17	2	-3/+21
\| \| \| \| \| \| \| \| \| \| \| \|	one needs a hand-crafted xchan at the moment to make use of it and if you wish to do so, there will be no assistance or help provided. The risk of system instability and mangled DBs now and going forward is significant if you try this.
\| * \|	operation snakebite continued. openid now works for local accounts using the ↵	friendica	2014-02-17	4	-2/+125
\| \| \| \| \| \| \| \| \| \| \| \|	rmagic module and after storing your openid in pconfig. This is just an interesting but trivial (in the bigger scheme of things) side effect of snakebite. The snake hasn't even waken up yet.
\| * \|	update openid for snakebite	friendica	2014-02-17	7	-106/+1350
\| \| \|
\| * \|	more snakebite stuff	friendica	2014-02-17	2	-25/+40
\| \| \|
\| * \|	Merge https://github.com/friendica/red into zpull	friendica	2014-02-17	1	-84/+87
\| \|\ \
\| \| * \|	Merge pull request #319 from dawnbreak/master	friendica	2014-02-18	1	-84/+87
\| \| \|\\| \| \| \| \| \| \| \| \|	Commenting language.php and some changes
\| \| \| *	Commenting language.php and some changes	Klaus	2014-02-18	1	-84/+87
\| \| \| \| \| \| \| \| \| \| \| \|	Some commenting for Doxygen, simplified detect_language() a bit, added a new function get_language_name() that I will use soon or can be used in general to display localized language names from language codes.
\| * \| \|	project "snakebite"	friendica	2014-02-17	1	-61/+70
\| \|/ /
\| * \|	project "snakebite"	friendica	2014-02-17	3	-8/+60
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master'	zottel	2014-02-17	16	-1603/+1674
\|\\| \|
\| * \|	Merge pull request #316 from dawnbreak/master	friendica	2014-02-17	2	-21/+1
\| \|\\| \| \| \| \| \| \|	Make asset icons work in subdir installs as well.
\| \| *	removed unused function posted_date_widget	Klaus	2014-02-16	1	-20/+0
\| \| \| \| \| \| \| \| \|	This functions seems not to be used anywhere. include/widgets.php contains widget_archive($arr) which has the same functionality.
\| \| *	Make asset icons work in subdir installs as well.	Klaus	2014-02-15	1	-1/+1
\| \| \| \| \| \| \| \| \|	This should be the right way I guess, especially if red# is installed in a subdirectory. (untested)
\| * \|	Merge pull request #314 from zzottel/master	friendica	2014-02-17	1	-0/+6
\| \|\ \ \| \| \| \| \| \| \| \|	Make @!-tags safer
\| * \| \|	several things were not working correctly w/r/t community tagging. The ↵	friendica	2014-02-16	4	-5/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit.
\| * \| \|	don't include deleted channels in number of channels service class checks	friendica	2014-02-16	2	-6/+11
\| \| \| \|
\| * \| \|	don't show deleted channels on admin account summary page	friendica	2014-02-16	1	-2/+3
\| \| \| \|
\| * \| \|	Merge https://github.com/friendica/red into zpull	friendica	2014-02-16	4	-1558/+1621
\| \|\ \ \
\| \| * \| \|	Windows hack for proc_run() from Marshall	Thomas Willingham	2014-02-16	1	-2/+7
\| \| \| \| \|
\| \| * \| \|	Merge pull request #318 from tobiasd/20140216	tobiasd	2014-02-16	2	-1556/+1604
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	DE: update to the strings
\| \| \| * \| \|	DE: update to the strings	Tobias Diekershoff	2014-02-16	2	-1556/+1604
\| \| \|/ / /
\| \| * \| \|	Merge pull request #315 from dawnbreak/master	friendica	2014-02-16	1	-0/+10
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|	Fix call to asset icons in RedBrowser.
\| \| \| * \|	Fix call to asset icons in RedBrowser.	Klaus	2014-02-15	1	-0/+10
\| \| \|/ / \| \| \| \| \| \| \| \|	RedBrowser was not displaying asset icons correctly, because the URL was wrong.
\| * / /	strip hard-wired zids from posted links as they will have the wrong identity ↵	friendica	2014-02-16	6	-12/+20
\| \|/ / \| \| \| \| \| \| \| \| \|	when somebody tries to view the link
* \| /	Merge remote-tracking branch 'upstream/master'	zottel	2014-02-15	75	-930/+1258
\|\\| \| \| \|/ \|/\|
\| *	preserve attachments when editing a post	friendica	2014-02-14	1	-0/+9
\| \|
\| *	rev update and a minor fix (missing param) to force_refresh	friendica	2014-02-14	4	-766/+805
\| \|
\| *	doc and assets update. There is what seems to be a controversial powerpoint ↵	friendica	2014-02-14	70	-164/+444
\| \| \| \| \| \| \| \|	in this checkin. The powerpoint is of course open source even if powerpoint itself is not. The source file is available for your examination and revision.
* \|	make sure the user can't inadvertently send a post with @!-tags to an	zottel	2014-02-14	1	-0/+6
\|/ \| \| \| \|	unintended audience because he had browsed the Matrix by collection or by contact
*	fix tag delivery default permissions (use channel_allow_cid rather than ↵	friendica	2014-02-13	1	-11/+11
\| \| \| \|	allow_cid etc.)
*	Merge https://github.com/friendica/red into zpull	friendica	2014-02-13	4	-20/+38
\|\
\| *	Merge pull request #313 from git-marijus/master	friendica	2014-02-14	4	-20/+38
\| \|\ \| \| \| \| \| \|	This makes advanced privacy settings adjustable in expert mode only. Als...
\| \| *	This makes advanced privacy settings adjustable in expert mode only. Also ↵	marijus	2014-02-13	4	-20/+38
\| \|/ \| \| \| \| \| \|	they are hidden behind a button. This is a design hotfix should probably come up with something better someday...
* /	more debugging dav in windows, windows never forgets your dav credentials ↵	friendica	2014-02-13	1	-0/+1
\|/ \| \| \|	even if you get them wrong and even if you remove them from the credential vault. This makes it very difficult to manage two or more channels with file resources.
*	reddav - disable assets	friendica	2014-02-13	1	-1/+1
\|
*	don't fix the height of the archive widget - fix the maximum height	friendica	2014-02-13	1	-1/+1
\|
*	very simple scheme	friendica	2014-02-13	2	-1/+6
\|