Domovoy bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ...

Conflicts:
	include/conversation.php

2012-09-10 09:19:08 +02:00

..

cleanzero

Option to set theme width added. Minor layout changes

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

comix

Threading updates

2012-08-11 14:36:58 -06:00

comix-plain

Threading updates

2012-08-11 14:36:58 -06:00

darkbubble

add a placeholder attribute on search-text; dispy fixes

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

darkzero

One click comments on threaded items.

2012-08-23 13:09:35 +02:00

darkzero-NS

Darkzero/NS .contact-photo-menu

2012-08-03 03:07:29 +01:00

diabook

basic updates for Dispy and Diabook to try to make them at least not broken with threading updates

2012-08-14 19:42:07 -06:00

dispy

basic updates for Dispy and Diabook to try to make them at least not broken with threading updates

2012-08-14 19:42:07 -06:00

duepuntozero

One click comments on threaded items.

2012-08-23 13:09:35 +02:00

easterbunny

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

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

facepark

Threading updates

2012-08-11 14:36:58 -06:00

frost

add settings sections and add contacts; other tweaks and fixes

2012-09-07 12:17:03 -06:00

frost-mobile

frost-mobile: was missing infront of the nav-images

2012-09-09 13:26:15 +02: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: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas

2012-09-01 04:52:01 -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

smoothly

remove mobile file

2012-09-10 00:15:01 -07:00

testbubble

conversation.tpl doesnt appear to be necessary

2012-09-05 11:12:08 -06:00

vier

Make Vier threaded comments not broken.

2012-08-16 18:21:33 +01:00