friendica 51bee79b21 Merge https://github.com/friendica/friendica into pull ... Conflicts: view/theme/smoothly/follow.tpl		2012-09-19 15:39:19 -07:00
..
cleanzero	Remove and ignore .DS_Store	2012-09-17 23:03:34 +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	Corrected titlebar notifications in Diabook	2012-09-17 17:54:07 +02:00
dispy	Add titlebar notifications to Dispy.	2012-09-17 14:54:40 +01:00
duepuntozero	bring back comment edit buttons	2012-09-10 18:06:18 -07: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	missed one	2012-09-16 18:57:04 -06:00
frost-mobile	various bug fixes	2012-09-16 18:56:31 -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: lilac color schema	2012-09-14 17:01:26 +02:00
slack-NS	cleanup - make bb-buttons vanish when comment closed	2012-04-25 00:13:36 -07:00
slackr	bring back comment edit buttons	2012-09-10 18:06:18 -07:00
smoothly	Merge https://github.com/friendica/friendica into pull	2012-09-19 15:39:19 -07:00
testbubble	permissions selector showing up for guests, testbubble and smoothly	2012-09-15 20:21:17 -07:00
vier	Make Vier threaded comments not broken.	2012-08-16 18:21:33 +01:00