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 |
|
Simon L'nu
|
df82affe2f
|
finish styling category tags and category input
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-05 00:04:23 -04:00 |
|
Simon L'nu
|
9ee424c1e3
|
style categorytags
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-04 23:47:35 -04:00 |
|
Simon L'nu
|
8e5489846d
|
update the dispy* templates
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-04 23:35:07 -04:00 |
|
friendica
|
c4ca21a762
|
move alert box away from nav links
|
2012-04-04 19:13:41 -07:00 |
|
Simon L'nu
|
922d690d1e
|
latest changes are the popup menu for notifs, fixes
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-04 02:19:39 -04:00 |
|
friendica
|
1e02fd8a72
|
Merge branch 'pull'
|
2012-04-03 19:16:59 -07:00 |
|
friendica
|
3db2cf76b9
|
remove loozah themes which fell too far behind to recover
|
2012-04-03 16:40:25 -07:00 |
|
tommy tomson
|
f0a8ef64fe
|
smal fix
|
2012-04-03 21:45:58 +02:00 |
|
tommy tomson
|
cd309b69e6
|
german translation for right_aside
|
2012-04-03 21:06:57 +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
|
b5d57d5313
|
diabook-themes: fixed pageheader
|
2012-04-02 17:17:14 +02:00 |
|
tommy tomson
|
9faa940f04
|
diabook-themes: bugfixes / css-fixes
|
2012-04-02 15:06:55 +02:00 |
|
Michael Johnston
|
581b54c974
|
allow users to set categories on their posts
|
2012-04-01 21:28:31 -04: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
|
408de09f72
|
css-fixes
|
2012-04-02 00:05:49 +02:00 |
|
tommy tomson
|
f075e977fe
|
add new messages-layout in diabook
|
2012-04-01 18:12:20 +02:00 |
|
tommy tomson
|
ff12637ceb
|
fix the display of community-plugin in diabook-themes
|
2012-04-01 16:34:31 +02:00 |
|
tommy tomson
|
15ba0ef5d0
|
various bugfixes and css-fixes
|
2012-04-01 13:12:15 +02:00 |
|
friendica
|
bc283f7c5d
|
qcomment overflow
|
2012-04-01 03:37:41 -07:00 |
|
friendica
|
ae5e5bf1e4
|
Merge branch 'pull'
|
2012-04-01 01:03:05 -07:00 |
|
friendica
|
5c2fdc795f
|
send unverified private mail using zrl
|
2012-04-01 00:59:35 -07:00 |
|
Simon L'nu
|
db7f7e4237
|
latest fixes for dispys. tweaking/repairing
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-04-01 03:57:05 -04: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 |
|
friendica
|
d5a31e5791
|
Merge branch 'pull'
|
2012-03-31 04:40:35 -07: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 |
|
Simon L'nu
|
f5e3ec9a56
|
forgot the css changes for last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-31 04:02:51 -04:00 |
|
friendica
|
b4b1055b50
|
settings for unknown private mail acceptance
|
2012-03-31 00:57:59 -07:00 |
|
Simon L'nu
|
b88a452c6b
|
theme fixes; fix qcomment (finally)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-31 03:56:06 -04:00 |
|
Fabio Comuni
|
be2005f146
|
quattro: move quattro-green inside quattro folder.
Add config option to select quattro color scheme.
|
2012-03-30 21:21:14 +02:00 |
|
Fabio Comuni
|
77f57e1b13
|
Merge remote-tracking branch 'friendica/master'
|
2012-03-30 19:37:43 +02:00 |
|
tommy tomson
|
f50fb7d6ca
|
css-fixes in diabook-derivates
|
2012-03-30 17:52:29 +02:00 |
|
tommy tomson
|
6d3d882f9b
|
css-fixes in diabook-derivates
|
2012-03-30 16:33:34 +02:00 |
|
Fabio Comuni
|
24e7a3413c
|
quattro-green: remove settings code
Use config.php from quattro
|
2012-03-30 15:46:14 +02:00 |
|
Fabio Comuni
|
db59a45030
|
quattro: add config.php
|
2012-03-30 15:45:23 +02:00 |
|
Fabio Comuni
|
054d21a2e8
|
settings: add "display settings" tab, with UI-related settings.
Load optional "config.php" from theme folder and show in page.
Loading of "config.php" follow theme_info['extends'] property.
|
2012-03-30 15:45:02 +02:00 |
|
tommy tomson
|
5b4bb347a6
|
css-fixes in diabook-derivates
|
2012-03-30 14:38:21 +02:00 |
|
Tobias Diekershoff
|
8685a91742
|
quattro-green: added Description to the theme.php
|
2012-03-30 14:24:45 +02:00 |
|
Tobias Diekershoff
|
b5e292509e
|
quattro-green: adopted quattro option for centered display
|
2012-03-30 14:03:33 +02:00 |
|
tommy tomson
|
5ced7f2bc5
|
add themes diabook-red & diabook-aerith
|
2012-03-30 13:48:34 +02:00 |
|
Tobias Diekershoff
|
e2370b56bf
|
quattro-greey: apply theming to private mail
|
2012-03-30 08:10:49 +02:00 |
|
Simon L'nu
|
3b4016168d
|
tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-29 20:19:43 -04:00 |
|
friendica
|
e935b3a225
|
theme file_as combobox for 2.0
|
2012-03-29 04:07:16 -07:00 |
|
tommy tomson
|
339c8a4b56
|
css fixes in diabook-derivates
|
2012-03-29 11:02:59 +02:00 |
|
fabrixxm
|
3ee529d095
|
Merge pull request #185 from fabrixxm/master
Updated private message pages
|
2012-03-28 23:47:23 -07:00 |
|
friendica
|
75f3d41da2
|
Merge pull request #184 from annando/master
Enhancing the API - Preparations for a better facebook export
|
2012-03-28 15:08:15 -07:00 |
|