danielgrippi
|
f839714646
|
added aspect filtering to contact index. fixed rspec
|
2011-06-27 15:03:39 -07:00 |
|
danielgrippi
|
a2609f7dac
|
simple filter on contacts index page (my/all contacts)
|
2011-06-27 12:12:50 -07:00 |
|
Raphael Sofaer
|
5884a900a2
|
Get rid of manage
|
2011-06-24 16:55:40 -07:00 |
|
danielgrippi
|
16351227f7
|
use aspect dropdowns everywhere; updated rake to 0.9.0
|
2011-05-20 11:50:41 -07:00 |
|
danielgrippi
|
7eaca0346c
|
Merge branch 'master' into follow
Conflicts:
config/assets.yml
public/stylesheets/sass/_mixins.scss
spec/models/user/posting_spec.rb
|
2011-05-16 14:56:28 -07:00 |
|
danielgrippi
|
ee49fb3547
|
no more n-query in the view problem
|
2011-05-13 16:49:37 -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 |
|
zhitomirskiyi
|
469d5b99a2
|
WIP added a share view, tests are red
|
2011-05-09 16:55:22 -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
|
c128cae4ec
|
specs green after moving ContactController#new to AspectsMembership#new
|
2011-04-08 11:44:09 -07:00 |
|
danielgrippi
|
aeda5a4e39
|
dispatching / receiving logic complete. following wip.
|
2011-04-07 18:29:24 -07:00 |
|
danielgrippi
|
590e1fd93f
|
All green except invite connecting +2 misc.
|
2011-04-04 15:16:19 -07:00 |
|
zhitomirskiyi
|
16b7ec3990
|
pulled out share_with to be contact new and contact show
|
2011-02-17 18:05:21 -08:00 |
|
maxwell
|
7ace73b84b
|
iz ms wip fixing contactController destroy
|
2011-02-17 18:05:21 -08:00 |
|
maxwell
|
c6eb5d0340
|
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
|
2011-02-17 18:05:21 -08:00 |
|
maxwell
|
8ae23f5705
|
wip
|
2011-02-17 18:05:21 -08:00 |
|
maxwell
|
17a801394e
|
work in progress. need to update the views for the controller changes
|
2011-02-17 18:05:21 -08:00 |
|