 Christian Vogeley
|
27197e5b50
|
allow again zrl and zmg in api
the problem was that the values weren’t returned and so the android
client received a null value
|
2014-03-09 04:08:22 +01:00 |
|
|
cvogeley
|
0850a5d63d
|
Typo
|
2014-02-27 09:39:07 +01:00 |
|
|
Christian Vogeley
|
f6be815c31
|
more tweaks
|
2014-02-22 22:54:09 +01:00 |
|
|
Christian Vogeley
|
a5f70f6c10
|
little tweaks
|
2014-02-22 20:30:41 +01:00 |
|
|
Christian Vogeley
|
f9eddb89ef
|
Add option for narrow navbar instead of the bootstrap default
thick version
|
2014-02-22 16:10:46 +01:00 |
|
 tobiasd
|
bbea85f809
|
Merge pull request #333 from tobiasd/20140222
DE: Update to the strings
|
2014-02-22 14:12:37 +01:00 |
|
|
Tobias Diekershoff
|
65d5fae324
|
DE: update to the strings
|
2014-02-22 14:10:21 +01:00 |
|
 friendica
|
9c4c0e6d23
|
prevent mod/cloud looping (ping gets a new session on each call [wtf?] which triggers our "changed uid" detector)
|
2014-02-22 03:38:23 -08:00 |
|
|
friendica
|
f63e220939
|
Merge https://github.com/friendica/red into zpull
|
2014-02-21 23:52:20 -08:00 |
|
|
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
|
07fb85fcc9
|
Merge pull request #332 from zzottel/master
First steps at German doco
|
2014-02-22 09:01:48 +11:00 |
|
|
friendica
|
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 |
|
 zottel
|
a66e7d2999
|
changed old Friendica stuff to what we have now in Red
|
2014-02-21 22:27:21 +01:00 |
|
|
zottel
|
fe6cd80285
|
small corrections
|
2014-02-21 22:27:03 +01:00 |
|
|
zottel
|
d58068186b
|
first few German help files
|
2014-02-21 22:26:29 +01:00 |
|
|
zottel
|
6249178b79
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-21 22:25:06 +01:00 |
|
 marijus
|
32d0189b56
|
remove some design fixes which got fixed in bootstrap 3.1.1
|
2014-02-21 14:38:21 +01:00 |
|
|
marijus
|
8c37a01f74
|
dont allow bootstrap to mess with blockquote font-size
|
2014-02-21 13:57:00 +01:00 |
|
|
marijus
|
7b1cabdd58
|
quickfix for edit profile dropdown
|
2014-02-21 13:26:13 +01:00 |
|
|
marijus
|
593631d8f5
|
oups... to much cleaning...
|
2014-02-21 13:03:32 +01:00 |
|
|
marijus
|
9473ddd576
|
update to bootstrap version 3.1.1 which is now completely MIT licensed
|
2014-02-21 12:47:19 +01:00 |
|
|
friendica
|
c128c6e84a
|
Merge pull request #330 from git-marijus/master
cleanup style.css
|
2014-02-21 22:44:49 +11:00 |
|
|
marijus
|
052be3c92b
|
cleanup style.css
|
2014-02-21 12:16:26 +01:00 |
|
|
zottel
|
8bd006bea8
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-21 08:54:46 +01: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 |
|
|
zottel
|
79c566bda3
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-20 11:17:07 +01: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 |
|
|
zottel
|
b223b52f83
|
Merge remote-tracking branch 'upstream/master'
|
2014-02-20 08:42:40 +01: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 |
|