Michael Vogel
|
7235d5466a
|
Removed changes
|
2012-03-11 20:24:55 +01:00 |
|
Michael Vogel
|
d653e27e2d
|
Merge commit 'upstream/master'
Conflicts:
view/theme/diabook/wall_item.tpl
view/theme/diabook/wallwall_item.tpl
|
2012-03-11 20:22:28 +01:00 |
|
Michael Vogel
|
b879a1ddf1
|
Pages: Show every community page - even from foreign servers (with caching)
|
2012-03-11 17:45:12 +01:00 |
|
Simon L'nu
|
258a8c0871
|
screwed up on the font-size for screen last push
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 10:29:12 -04:00 |
|
Simon L'nu
|
fa0cb8514d
|
add some '@media handheld' types for dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 10:24:49 -04:00 |
|
Simon L'nu
|
62fe48f064
|
fix more stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 10:14:31 -04:00 |
|
Simon L'nu
|
57d8370376
|
fix some stuff right away
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 09:12:31 -04:00 |
|
Simon L'nu
|
f7ade749b8
|
preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-11 01:32:11 -05:00 |
|
Michael Vogel
|
74b3e9f273
|
Enabled Caching for items. Changed color of tags in diabook.
|
2012-03-10 15:50:35 +01:00 |
|
tomtom84
|
c79cb57e1e
|
Merge pull request #118 from tomtom84/master
fixes in diabook-derivates
|
2012-03-10 04:24:49 -08:00 |
|
tommy tomson
|
0f3255467e
|
fixed login-fields, fixed. notofication.png, changed locations
|
2012-03-10 13:22:41 +01:00 |
|
Michael Vogel
|
cb1ecf2c5a
|
diabook: Moving the location between the icons
|
2012-03-10 00:15:27 +01:00 |
|
tomtom84
|
68ca29719e
|
Merge pull request #116 from tomtom84/master
fixes in diabook-derivates
|
2012-03-09 09:17:01 -08:00 |
|
tommy tomson
|
8fe4645a5d
|
add js to hide nav-menus, when clicked outside
|
2012-03-09 18:15:27 +01:00 |
|
tomtom84
|
68541b5dd2
|
Merge pull request #115 from tomtom84/master
fixes in diabook-derivates
|
2012-03-09 04:24:59 -08:00 |
|
tommy tomson
|
9f441731af
|
fixes in css
|
2012-03-09 13:23:38 +01:00 |
|
Simon L'nu
|
81f5b0e2df
|
[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-09 00:26:54 -05:00 |
|
Simon L'nu
|
dc8d060d4d
|
i consider dispy pretty stable at this point, so i'm removing the experimental file
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-09 00:00:56 -05:00 |
|
Simon L'nu
|
20b2090182
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
removed info
add info
fixed star-bug
More improved transparency for smilies
removed dolphin file (wtf?)
.
* master:
|
2012-03-08 23:59:43 -05:00 |
|
tomtom84
|
e25fb2b2f9
|
Merge pull request #112 from tomtom84/master
fixes in diabook-derivates
|
2012-03-08 19:39:39 -08:00 |
|
tommy tomson
|
e06b941307
|
removed info
|
2012-03-09 04:38:20 +01:00 |
|
tomtom84
|
92ab98f8d8
|
Merge pull request #111 from tomtom84/master
fixes in diabook-derivates
|
2012-03-08 19:16:01 -08:00 |
|
tommy tomson
|
722f631d15
|
add info
|
2012-03-09 04:14:24 +01:00 |
|
tomtom84
|
05561bd905
|
Merge pull request #110 from tomtom84/master
fixes in diabook-derivates
|
2012-03-08 18:02:25 -08:00 |
|
tommy tomson
|
feda3cfc96
|
fixed star-bug
|
2012-03-09 02:59:13 +01:00 |
|
Simon L'nu
|
8d19baadff
|
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
theme info file for testbubble
catalan translation
revup
add theme diabook-blue, fix css
* master:
|
2012-03-08 20:38:54 -05:00 |
|
friendica
|
b86a08166c
|
theme info file for testbubble
|
2012-03-08 16:30:45 -08:00 |
|
friendica
|
3b47626c15
|
Merge https://github.com/friendica/friendica into pull
|
2012-03-08 14:35:47 -08:00 |
|
tommy tomson
|
b9dda93f0c
|
add theme diabook-blue, fix css
|
2012-03-08 23:22:26 +01:00 |
|
Simon L'nu
|
5fe8952c29
|
make svg from notifications.svg to ease future editing. more dispy tweaks
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-08 13:37:45 -05:00 |
|
tomtom84
|
08b5ede5a1
|
Merge pull request #107 from tomtom84/master
fixes in theme diabook
|
2012-03-08 05:52:14 -08:00 |
|
tommy tomson
|
1fcbc7aa5a
|
add links to /profiles, add some icons to diabook/icons, fixes in css
|
2012-03-08 14:49:07 +01:00 |
|
Simon L'nu
|
15d310e4c3
|
fix jot.tpl buttons. fix up subsequent styling breakage
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-07 12:35:04 -05:00 |
|
Simon L'nu
|
66d2c52b5f
|
push fix for funky menu action. the overflow-x might break again for some people
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-07 10:07:36 -05:00 |
|
tomtom84
|
dd2ff7c796
|
Merge pull request #103 from tomtom84/master
fixes in theme diabook
|
2012-03-06 23:44:18 -08:00 |
|
tommy tomson
|
ec3ce05357
|
fix in navbar
|
2012-03-07 08:42:19 +01:00 |
|
tomtom84
|
05a52b2660
|
Merge pull request #101 from tomtom84/master
fixes in theme diabook
|
2012-03-06 15:49:32 -08:00 |
|
tommy tomson
|
49b5a1bf20
|
fix in navbar
|
2012-03-07 00:47:43 +01:00 |
|
Simon
|
decc9e5798
|
Merge pull request #99 from tomtom84/master
fixes in theme diabook
|
2012-03-06 15:22:55 -08:00 |
|
tommy tomson
|
6a5c4bab9c
|
messages-menu translation, add scroll-to-top and theme-bug-report in theme
|
2012-03-07 00:07:27 +01:00 |
|
Simon L'nu
|
edd450cf06
|
dispy, dispy, oh what a little lispy
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-06 17:55:05 -05:00 |
|
Simon L'nu
|
bc8b014906
|
styling fixes in dispy. fix typos in settings.tpl
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
|
2012-03-06 16:18:26 -05:00 |
|
Fabio Comuni
|
607ee1ff9c
|
quattro: theme settings (a bit hackish)
|
2012-03-06 09:50:18 +01:00 |
|
tommy tomson
|
eaaf030c18
|
Merge remote-tracking branch 'origin/master'
|
2012-03-06 08:28:21 +01:00 |
|
tommy tomson
|
b64b1d13a4
|
fixes in diabook
|
2012-03-06 08:27:20 +01:00 |
|
friendica
|
321b651635
|
Merge branch 'pull'
|
2012-03-05 18:52:15 -08:00 |
|
friendica
|
23460302f5
|
some admin page fixes and cleanup
|
2012-03-05 18:51:21 -08:00 |
|
Michael Johnston
|
9f44dbbb48
|
changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)
|
2012-03-05 21:10:01 -05:00 |
|
friendica
|
e5de03040e
|
Merge branch 'pull'
|
2012-03-05 15:59:28 -08:00 |
|
friendica
|
7b3349f38a
|
some testbubble stuff
|
2012-03-05 15:58:26 -08:00 |
|