07fb85fcc9
Merge pull request #332 from zzottel/master
...
First steps at German doco
2014-02-22 09:01:48 +11:00
e43ffdaaf4
Merge pull request #331 from git-marijus/master
...
update bootstrap and revert some style.css cleaning
2014-02-22 09:01:31 +11:00
a66e7d2999
changed old Friendica stuff to what we have now in Red
2014-02-21 22:27:21 +01:00
fe6cd80285
small corrections
2014-02-21 22:27:03 +01:00
d58068186b
first few German help files
2014-02-21 22:26:29 +01:00
6249178b79
Merge remote-tracking branch 'upstream/master'
2014-02-21 22:25:06 +01:00
32d0189b56
remove some design fixes which got fixed in bootstrap 3.1.1
2014-02-21 14:38:21 +01:00
8c37a01f74
dont allow bootstrap to mess with blockquote font-size
2014-02-21 13:57:00 +01:00
7b1cabdd58
quickfix for edit profile dropdown
2014-02-21 13:26:13 +01:00
593631d8f5
oups... to much cleaning...
2014-02-21 13:03:32 +01:00
9473ddd576
update to bootstrap version 3.1.1 which is now completely MIT licensed
2014-02-21 12:47:19 +01:00
c128c6e84a
Merge pull request #330 from git-marijus/master
...
cleanup style.css
2014-02-21 22:44:49 +11:00
052be3c92b
cleanup style.css
2014-02-21 12:16:26 +01:00
8bd006bea8
Merge remote-tracking branch 'upstream/master'
2014-02-21 08:54:46 +01:00
44d7047fce
SECURITY: do not automatically open an iframe which points into the local website.
2014-02-20 21:15:35 -08:00
9db40322ab
move jgrowl (alert popup) out of the now taller navbar
2014-02-20 18:51:35 -08:00
8367a92214
fix login weirdness for accounts that need to be approved
2014-02-20 18:38:52 -08:00
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
057e6660ca
Merge https://github.com/friendica/red into zpull
2014-02-20 17:08:02 -08:00
e55170c00a
code cleanup
2014-02-20 17:07:43 -08:00
df8e8c3bc5
Merge pull request #327 from git-marijus/master
...
fixes issue #326 initial scale to big
2014-02-21 10:18:34 +11:00
5c984aab66
Merge https://github.com/friendica/red into zpull
2014-02-20 15:00:58 -08:00
3bddaa9e04
title missing in private mention posts
2014-02-20 15:00:29 -08:00
aa9ae54ee6
Merge pull request #328 from tuscanhobbit/master
...
PT-BR: update to the strings
2014-02-20 23:40:21 +01:00
34d30e4d7e
PT-BR: update to the strings
2014-02-20 23:37:54 +01:00
e56abd1782
updated fr translation
2014-02-20 14:15:57 -08:00
a3191996e7
fixes issue #326 initial scale to big
2014-02-20 19:54:16 +01:00
4944070e79
vsprintf error on update
2014-02-20 02:30:37 -08:00
79c566bda3
Merge remote-tracking branch 'upstream/master'
2014-02-20 11:17:07 +01:00
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
a7194bc79a
fix the broken hublocs in an update
2014-02-20 01:44:29 -08:00
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
b223b52f83
Merge remote-tracking branch 'upstream/master'
2014-02-20 08:42:40 +01:00
5939da8b09
Merge branch 'master' of https://github.com/friendica/red
2014-02-20 08:33:55 +01:00
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
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
9715176a56
s/View remote profiles as webpages/Do not view remote profiles in
...
frames/g
2014-02-19 22:56:52 -05:00
40dbd34405
Merge pull request #322 from dawnbreak/master
...
Doxygen include/attach.php
2014-02-20 14:08:47 +11:00
5ae05e32e5
Merge pull request #321 from git-marijus/master
...
bootstrapify the nav
2014-02-20 14:06:00 +11:00
225ad00b0e
Merge branch 'master' of https://github.com/friendica/red
2014-02-20 00:29:33 +01:00
eae1063663
Merge pull request #323 from tuscanhobbit/master
...
IT: update to the strings
2014-02-19 22:03:48 +01:00
c82970c6bb
IT: update to the strings
2014-02-19 21:57:37 +01:00
d755fb83a7
Doxygen include/attach.php
...
Some Doxygen as far as I understood and some styleguides.
2014-02-19 21:04:20 +01:00
82b028173c
another correction
2014-02-19 20:08:02 +01:00
31d9bf0417
Merge branch 'master' of https://github.com/friendica/red
2014-02-19 19:31:29 +01:00
3a6760f6d1
one pixel to much...
2014-02-19 18:55:24 +01:00
c09087262c
bootstrapify the nav
2014-02-19 18:42:37 +01:00
79d3dae7fa
Merge remote-tracking branch 'upstream/master'
2014-02-19 08:30:14 +01:00
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
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
zottel
marijus
Paolo T
tony baldwin
Klaus