Merge branch 'master' of github.com:dmitryame/echowaves
removing the ads
updated the README with new echowaves reference
added mov as an available attachment, encreased the size of the attac…
…hed file allowed (this should be controlled at the nginx anyways)
add route needed by echophone
fixing the invite screen, we should not be able to change the status …
…of the convo from the invite screen anyways
Merge branch 'waseem'
Merge git://github.com/eager/echowaves into eager
Fix JSLint warnings
Fix issue where dockBadge sometimes shows "0" in Fluid apps. Also fix…
… capitalization typo in method name.
ConversationsController#toggle_readwrite_status is not
issue 180: activate account of password reset requiest
issue 185: do not offer option to invite all followers for private co…
issue 186: the convo now cant be changed from private to public and back
moved SSL variable initialization higher to resolve some dependencies…
Fixed test in SubscriptionsControllerTest.
removing orphaned file
Merge branch 'master' of git://github.com/dmitryame/echowaves
update message test
no more broken links
don't require gems from github anymore
[home page] don't fail if the home convo or the test convo are not cr…
fixing the invite bug
Added test for SubscriptionsController#destroy.
ConversationsController#remove_user is now
changing gravtastic gem
updating some mysql instructions
Introduced a Subscription as a new resource. Some heavy refactoring.
ConvesationsController#follow is now SubscribersController#create.
Some tests for SucbscribersController#index.