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

	Commit message (Collapse)	Author	Age	Files	Lines
*	SECURITY: do not automatically open an iframe which points into the local ↵	friendica	2014-02-20	2	-1/+10
\| \| \| \|	website.
*	move jgrowl (alert popup) out of the now taller navbar	friendica	2014-02-20	1	-1/+1
\|
*	fix login weirdness for accounts that need to be approved	friendica	2014-02-20	2	-5/+11
\|
*	small changes to a couple of lookup functions which we need to use a bit more	friendica	2014-02-20	4	-5/+9
\|
*	Merge https://github.com/friendica/red into zpull	friendica	2014-02-20	1	-1/+1
\|\
\| *	Merge pull request #327 from git-marijus/master	friendica	2014-02-21	1	-1/+1
\| \|\ \| \| \| \| \| \|	fixes issue #326 initial scale to big
\| \| *	fixes issue #326 initial scale to big	marijus	2014-02-20	1	-1/+1
\| \| \|
\| \| *	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-02-20	12	-81/+185
\| \| \|\
\| \| * \	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-02-20	2	-929/+977
\| \| \|\ \
* \| \| \| \|	code cleanup	friendica	2014-02-20	3	-23/+14
\|/ / / /
* \| \| \|	Merge https://github.com/friendica/red into zpull	friendica	2014-02-20	2	-3543/+7994
\|\ \ \ \
\| * \ \ \	Merge pull request #328 from tuscanhobbit/master	Paolo T	2014-02-20	2	-3543/+7994
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	PT-BR: update to the strings
\| \| * \| \| \|	PT-BR: update to the strings	tuscanhobbit	2014-02-20	2	-3543/+7994
\| \| \| \| \| \|
* \| \| \| \| \|	title missing in private mention posts	friendica	2014-02-20	2	-4/+2
\|/ / / / /
* \| \| \| \|	updated fr translation	friendica	2014-02-20	2	-976/+1024
\| \| \| \| \|
* \| \| \| \|	vsprintf error on update	friendica	2014-02-20	2	-3/+3
\| \| \| \| \|
* \| \| \| \|	use the medium size photo on the nav bar if that photo stays larger, as the ↵	friendica	2014-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	small one usually looks awful when you scale it up.
* \| \| \| \|	fix the broken hublocs in an update	friendica	2014-02-20	2	-2/+18
\| \| \| \| \|
* \| \| \| \|	believe i found the issue which was causing hundreds/thousands of identical ↵	friendica	2014-02-20	3	-11/+14
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	hublocs to be created
* \| \| \|	Merge pull request #324 from tonybaldwin/master	friendica	2014-02-20	6	-6/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
\| * \| \| \|	s/View remote profiles as webpages/Do not view remote profiles in	tony baldwin	2014-02-19	6	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	frames/g
* \| \| \| \|	use a "fullscreen" icon for chanview full screen mode; add channel_menu ↵	friendica	2014-02-19	6	-5/+53
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	selection and setting to the settings page.
* \| \| \|	Merge pull request #322 from dawnbreak/master	friendica	2014-02-20	1	-70/+126
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Doxygen include/attach.php
\| * \| \| \|	Doxygen include/attach.php	Klaus	2014-02-19	1	-70/+126
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some Doxygen as far as I understood and some styleguides.
* \| \| \| \|	Merge pull request #321 from git-marijus/master	friendica	2014-02-20	8	-250/+308
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| / \| \|_\|_\|/ \|/\| \| \|	bootstrapify the nav
\| * \| \|	another correction	marijus	2014-02-19	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of https://github.com/friendica/red	marijus	2014-02-19	6	-22/+84
\| \|\ \ \
\| * \| \| \|	one pixel to much...	marijus	2014-02-19	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	bootstrapify the nav	marijus	2014-02-19	8	-250/+308
\| \| \| \| \|
* \| \| \| \|	Merge pull request #323 from tuscanhobbit/master	Paolo T	2014-02-19	2	-929/+977
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|	IT: update to the strings
\| * \| \|	IT: update to the strings	tuscanhobbit	2014-02-19	2	-929/+977
\| \| \| \|
* \| \| \|	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.