Michael Vogel 04c31d194f Merge remote branch 'upstream/master' ...

Conflicts:
	update.php

2012-08-02 00:21:14 +02:00

..

cleanzero

Option to set theme width added. Minor layout changes

2012-05-05 00:45:35 +02:00

comix

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

comix-plain

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

darkbubble

add a placeholder attribute on search-text; dispy fixes

2012-05-23 15:58:22 -04:00

darkzero

Various theme stuff.

2012-07-02 03:40:12 +01:00

darkzero-NS

Various theme stuff.

2012-07-02 03:40:12 +01:00

diabook

bbcode: two new bbcode elements (style, class) for CSS

2012-08-02 00:13:37 +02:00

dispy

update head.tpl for dispy

2012-07-24 18:29:23 -06:00

duepuntozero

duplicate input names

2012-07-19 19:48:33 -07:00

easterbunny

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

facepark

Various theme stuff.

2012-07-02 03:40:12 +01:00

frost

fix almost all errant divs in view/ and frost folders

2012-07-31 22:43:18 -06:00

frost-mobile

fix almost all errant divs in view/ and frost folders

2012-07-31 22:43:18 -06:00

greenzero

cleanup - make bb-buttons vanish when comment closed

2012-04-25 00:13:36 -07:00

purplezero

cleanup - make bb-buttons vanish when comment closed

2012-04-25 00:13:36 -07:00

quattro

quattro: readd sparkle cursor

2012-08-01 04:45:27 -04:00

slack-NS

cleanup - make bb-buttons vanish when comment closed

2012-04-25 00:13:36 -07:00

slackr

a bit more colour

2012-07-05 22:20:27 -07:00

testbubble

Add sparkle cursor to Quattro/Vier/TestBubble

2012-07-12 19:21:21 +01:00

vier

Add sparkle cursor to Quattro/Vier/TestBubble

2012-07-12 19:21:21 +01:00