Alexander Kampmann
|
355c42cb30
|
Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
include/config.php
update.php
|
2012-04-05 13:39:15 +02:00 |
|
tommy tomson
|
f0a8ef64fe
|
smal fix
|
2012-04-03 21:45:58 +02:00 |
|
|
tommy tomson
|
8a71191d6d
|
make right_aside translatable and provide german translation...
and some css-fixes
|
2012-04-03 20:59:00 +02:00 |
|
|
tommy tomson
|
6dfd55668f
|
diabook-themes: css-fixes
|
2012-04-02 20:30:27 +02:00 |
|
|
tommy tomson
|
076b1b374b
|
diabook-themes: fixes in js
|
2012-04-02 18:16:58 +02:00 |
|
|
tommy tomson
|
23dc376364
|
diabook-themes: add link to global dir in "find friends" at right_aside
|
2012-04-02 01:29:20 +02:00 |
|
|
tommy tomson
|
f075e977fe
|
add new messages-layout in diabook
|
2012-04-01 18:12:20 +02:00 |
|
|
tommy tomson
|
15ba0ef5d0
|
various bugfixes and css-fixes
|
2012-04-01 13:12:15 +02:00 |
|
|
tommy tomson
|
36545e554b
|
diabook-themes: move "common tabs" to left side on settings page
|
2012-03-31 18:42:11 +02:00 |
|
|
tommy tomson
|
13ded12ffb
|
move the common tabs to right_aside in diabook-derivates
|
2012-03-31 16:58:02 +02:00 |
|
|
tommy tomson
|
893ece9066
|
bug fix in diabook-aerith and -red
|
2012-03-31 11:50:33 +02:00 |
|
|
tommy tomson
|
0b41654935
|
bug-fixes in diabook-derivates
|
2012-03-31 11:09:57 +02:00 |
|
|
tommy tomson
|
5ced7f2bc5
|
add themes diabook-red & diabook-aerith
|
2012-03-30 13:48:34 +02:00 |
|