Simon L'nu 1d9633b0cc Merge remote-tracking branch 'remotes/upstream/master' ...

* remotes/upstream/master:
  Friendicaland - remove states no longer flying the Friendica banner.
  deleted:    view/theme/smoothly/categories_widget.tpl 	deleted:    view/theme/smoothly/contact_template.tpl 	deleted:    view/theme/smoothly/footer.tpl 	deleted:    view/theme/smoothly/generic_links_widget.tpl 	deleted:    view/theme/smoothly/group_drop.tpl 	deleted:    view/theme/smoothly/group_side.tpl 	deleted:    view/theme/smoothly/header.tpl 	deleted:    view/theme/smoothly/mail_head.tpl 	deleted:    view/theme/smoothly/message_side.tpl 	deleted:    view/theme/smoothly/peoplefind.tpl 	modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/login.tpl 	modified:   view/theme/smoothly/style.css

2012-10-25 02:11:38 -04:00

..

cleanzero

get rid of 'Friendika'

2012-10-18 21:51:45 -07:00

comix

sort out the 'delete selected' mess

2012-09-25 19:10:46 -07:00

comix-plain

sort out the 'delete selected' mess

2012-09-25 19:10:46 -07:00

darkbubble

add a placeholder attribute on search-text; dispy fixes

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

darkzero

DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.

2012-10-22 01:49:35 +01:00

darkzero-NS

Darkzero/NS .contact-photo-menu

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

diabook

Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).

2012-10-23 20:05:55 +01:00

dispy

merge HEAD

2012-10-15 22:48:25 -04:00

duepuntozero

get rid of 'Friendika'

2012-10-18 21:51:45 -07:00

easterbunny

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

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

facepark

get rid of 'Friendika'

2012-10-18 21:51:45 -07:00

frost

get rid of 'Friendika'

2012-10-18 21:51:45 -07:00

frost-mobile

get rid of 'Friendika'

2012-10-18 21:51:45 -07: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

get rid of 'Friendika'

2012-10-18 21:51:45 -07:00

slack-NS

cleanup - make bb-buttons vanish when comment closed

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

slackr

class not id

2012-09-27 02:54:14 -07:00

smoothly

deleted: view/theme/smoothly/categories_widget.tpl

2012-10-24 16:41:56 +02:00

testbubble

update themes for new All Networks option

2012-10-04 19:59:30 -06:00

vier

get rid of 'Friendika'

2012-10-18 21:51:45 -07:00