Issue25#137

Open

zapcannon99 wants to merge 25 commits intolml:masterfrom

zapcannon99:issue25

Commits on Jun 11, 2012

changed the views to show discussion instead of message
Joel Yin
committed

Commits on Jun 12, 2012

bleh
Joel Yin
committed
bleh
Joel Yin
committed
blah v3
Joel Yin
committed
ugh...so many changes....
Joel Yin
committed

Commits on Jun 13, 2012

run 1 of replacements
Joel Yin
committed

Commits on Jun 14, 2012

more changes
Joel Yin
committed
some stuff happened?
Joel Yin
committed
ugh
Joel Yin
committed
finally deleted messages, believe all connection to message is severed
Joel Yin
committed
finally working discussion inbox
Joel Yin
committed

Commits on Jun 15, 2012

trying to write tesys
Joel Yin
committed
still trying to write the tests
Joel Yin
committed

Commits on Jun 16, 2012

added one test, need to figure out other tests to do....
Joel Yin
committed
Merge branch 'master' into issue25
Joel Yin
committed
finished tests XD
Joel Yin
committed
Merge branch 'issue25' of https://github.com/zapcannon99/quadbase into issue25
Joel Yin
committed

Commits on Jun 26, 2012

merged with new master
Joel Yin
committed

Commits on Jun 27, 2012

changed Factory to FactoryGirl in tests
Joel Yin
committed

Commits on Jun 28, 2012

Merge branch 'master' into issue25
Joel Yin
committed

Commits on Jun 29, 2012

merge issues
Joel Yin
committed

Commits on Jul 9, 2012

Merge branch 'master' into issue25
Joel Yin
committed
few minor changes
Joel Yin
committed

Commits on Jul 12, 2012

fixed a few typos
Joel Yin
committed

Commits on Jul 20, 2012

fixed db
Joel Yin
committed