diaspora

mirror of https://github.com/diaspora/diaspora.git synced 2026-04-29 03:01:03 -04:00

Go to file

danielvincent 5be27f33ec Merge branch 'master' of github.com:diaspora/diaspora_rails

Conflicts:
	app/views/layouts/application.html.haml
	app/views/status_messages/_status_message.html.haml

2010-06-27 10:32:23 -07:00

app

Merge branch 'master' of github.com:diaspora/diaspora_rails

2010-06-27 10:32:23 -07:00

autotest

Activerecord this time\!

2010-06-11 10:40:49 -07:00

config

Comments now working, but no AJAX, need to refresh to see them

2010-06-25 22:15:41 -07:00

Activerecord this time\!

2010-06-11 10:40:49 -07:00

doc

Activerecord this time\!

2010-06-11 10:40:49 -07:00

lib

putting debug in for master so I can check deployed servers out

2010-06-26 14:16:19 -07:00

public

Merge branch 'master' of github.com:diaspora/diaspora_rails

2010-06-27 10:32:23 -07:00

script

Activerecord this time\!

2010-06-11 10:40:49 -07:00

spec

fixed a broken common.rb spec

2010-06-25 23:08:59 -07:00

test

Activerecord this time\!

2010-06-11 10:40:49 -07:00

vendor/plugins

Activerecord this time\!

2010-06-11 10:40:49 -07:00

.gitignore

RS, IZ; A bunch of deploy stuff, including nginx, nginx_conf (maybe), and thin conf

2010-06-18 17:33:43 -07:00

.rspec

added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster

2010-06-13 15:46:40 -07:00

Capfile

RS IZ deploy stuffz

2010-06-16 19:42:39 -07:00

config.ru

pulled in all of max's changes from yesterday to 187

2010-06-22 10:39:06 -07:00

Gemfile

MS mongomapper works kinda

2010-06-24 17:22:49 -07:00

Rakefile

Activerecord this time\!

2010-06-11 10:40:49 -07:00

README

added colors to rake spec, also, use a new shell and the command autotest to constantly keep the testing env going, much much faster

2010-06-13 15:46:40 -07:00

README

broner

Languages

Ruby 64.5%

JavaScript 20.8%

Haml 4.8%

Gherkin 4.1%

SCSS 3.2%

Other 2.6%