danielgrippi
|
91e649977c
|
MS DG update copyright
|
2011-09-14 11:23:12 -07:00 |
|
danielgrippi
|
60a60733df
|
Merge branch 'master' into follow
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
|
2011-05-12 15:49:51 -07:00 |
|
Arzumy MD
|
3767cce149
|
moved render_views out of controller specs to spec_helper.
cleaned up indentation and spacing in controller specs.
|
2011-05-07 18:38:40 +08:00 |
|
danielgrippi
|
aeda5a4e39
|
dispatching / receiving logic complete. following wip.
|
2011-04-07 18:29:24 -07:00 |
|
danielgrippi
|
4f972a23f6
|
drop requests table wip
|
2011-04-06 19:01:41 -07:00 |
|
danielgrippi
|
2e5b5e1efe
|
request notification emails -> started sharing notification emails
|
2011-04-06 13:21:15 -07:00 |
|
zhitomirskiyi
|
f99b724e0b
|
ms iz, can now undo hiding a post, fixed a bunch of jamine specs
|
2011-03-31 17:23:54 -07:00 |
|
zhitomirskiyi
|
5a9ec82597
|
can now hide posts
|
2011-03-30 16:43:28 -07:00 |
|
zhitomirskiyi
|
fb8b8ab7fc
|
wip holding off until the follow model is done
|
2011-03-30 16:43:28 -07:00 |
|