Commit Graph

9581 Commits

Author SHA1 Message Date
friendica 9e2ea6b5d4 strings/version update 2014-02-21 23:51:57 -08:00
friendica 0501bab7dc doc update 2014-02-21 23:51:43 -08:00
friendica 44d7047fce SECURITY: do not automatically open an iframe which points into the local website. 2014-02-20 21:15:35 -08:00
friendica 9db40322ab move jgrowl (alert popup) out of the now taller navbar 2014-02-20 18:51:35 -08:00
friendica 8367a92214 fix login weirdness for accounts that need to be approved 2014-02-20 18:38:52 -08:00
friendica e12f6f1bd9 small changes to a couple of lookup functions which we need to use a bit more 2014-02-20 17:20:24 -08:00
friendica 057e6660ca Merge https://github.com/friendica/red into zpull 2014-02-20 17:08:02 -08:00
friendica e55170c00a code cleanup 2014-02-20 17:07:43 -08:00
friendica df8e8c3bc5 Merge pull request #327 from git-marijus/master
fixes issue #326 initial scale to big
2014-02-21 10:18:34 +11:00
friendica 5c984aab66 Merge https://github.com/friendica/red into zpull 2014-02-20 15:00:58 -08:00
friendica 3bddaa9e04 title missing in private mention posts 2014-02-20 15:00:29 -08:00
Paolo T aa9ae54ee6 Merge pull request #328 from tuscanhobbit/master
PT-BR: update to the strings
2014-02-20 23:40:21 +01:00
tuscanhobbit 34d30e4d7e PT-BR: update to the strings 2014-02-20 23:37:54 +01:00
friendica e56abd1782 updated fr translation 2014-02-20 14:15:57 -08:00
marijus a3191996e7 fixes issue #326 initial scale to big 2014-02-20 19:54:16 +01:00
friendica 4944070e79 vsprintf error on update 2014-02-20 02:30:37 -08:00
friendica d8434bb480 use the medium size photo on the nav bar if that photo stays larger, as the small one usually looks awful when you scale it up. 2014-02-20 01:49:40 -08:00
friendica a7194bc79a fix the broken hublocs in an update 2014-02-20 01:44:29 -08:00
friendica 6eb971656e believe i found the issue which was causing hundreds/thousands of identical hublocs to be created 2014-02-20 01:35:08 -08:00
marijus 5939da8b09 Merge branch 'master' of https://github.com/friendica/red 2014-02-20 08:33:55 +01:00
friendica c219451702 Merge pull request #324 from tonybaldwin/master
Do not view remote profiles in frames. (changed description for display->settings), in ALL relevant files
2014-02-20 15:26:17 +11:00
friendica a29b71547a use a "fullscreen" icon for chanview full screen mode; add channel_menu selection and setting to the settings page. 2014-02-19 20:19:56 -08:00
tony baldwin 9715176a56 s/View remote profiles as webpages/Do not view remote profiles in
frames/g
2014-02-19 22:56:52 -05:00
friendica 40dbd34405 Merge pull request #322 from dawnbreak/master
Doxygen include/attach.php
2014-02-20 14:08:47 +11:00
friendica 5ae05e32e5 Merge pull request #321 from git-marijus/master
bootstrapify the nav
2014-02-20 14:06:00 +11:00
marijus 225ad00b0e Merge branch 'master' of https://github.com/friendica/red 2014-02-20 00:29:33 +01:00
Paolo T eae1063663 Merge pull request #323 from tuscanhobbit/master
IT: update to the strings
2014-02-19 22:03:48 +01:00
tuscanhobbit c82970c6bb IT: update to the strings 2014-02-19 21:57:37 +01:00
Klaus d755fb83a7 Doxygen include/attach.php
Some Doxygen as far as I understood and some styleguides.
2014-02-19 21:04:20 +01:00
marijus 82b028173c another correction 2014-02-19 20:08:02 +01:00
marijus 31d9bf0417 Merge branch 'master' of https://github.com/friendica/red 2014-02-19 19:31:29 +01:00
marijus 3a6760f6d1 one pixel to much... 2014-02-19 18:55:24 +01:00
marijus c09087262c bootstrapify the nav 2014-02-19 18:42:37 +01:00
friendica 24d119b8c4 introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is able to successfully authenticate (but is not necessarily in this network). 2014-02-18 20:59:25 -08:00
friendica 6ac81c9360 fix zrl bookmarks which broke with this checkin: c9192991c9
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.
2014-02-18 19:47:13 -08:00
friendica a258c8b98b Merge https://github.com/friendica/red into zpull 2014-02-18 19:17:45 -08:00
friendica 87bb568d67 change edit/delete to icons on filestorage page 2014-02-18 19:17:11 -08:00
friendica 2e305742fa Merge pull request #320 from dawnbreak/master
Let user cancel the red_encrypt dialogue
2014-02-19 12:01:34 +11:00
friendica 5747e20e50 some more snakebite and fix up include/account - forgot about that inline array stuff 2014-02-18 16:59:31 -08:00
friendica 7d4916ec71 service class downgrade to the default service class on account expiration if using a non-default service class and account has expired. 2014-02-18 15:17:18 -08:00
friendica 9a51f8ce65 edit bookmarks 2014-02-18 14:26:23 -08:00
Klaus aa44d3abab Let user cancel the red_encrypt dialogue
If the user press cancel on the prompt also cancel the encryption. Maybe should also add this to passhint promt.
2014-02-18 17:41:59 +01:00
friendica 0b4aa5a39c get_theme_uid() - if no uid, look for a system channel and use that. This allows default theme/scheme tweaks at the server level. 2014-02-17 20:38:30 -08:00
friendica 309ae2d1e4 update the donation link 2014-02-17 20:33:52 -08:00
friendica d5c55250f9 remove the exit clause 2014-02-17 20:24:34 -08:00
friendica ea709361f6 snakebite, cont. magic-auth via openid is now possible, with the caveat that 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. 2014-02-17 20:10:43 -08:00
friendica d6ab975b18 operation snakebite continued. openid now works for local accounts using the 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. 2014-02-17 19:48:05 -08:00
friendica 7fc292831c update openid for snakebite 2014-02-17 18:50:24 -08:00
friendica d3120264cb more snakebite stuff 2014-02-17 18:23:01 -08:00
friendica 9b0ae023ff Merge https://github.com/friendica/red into zpull 2014-02-17 16:00:39 -08:00