danielgrippi
|
16351227f7
|
use aspect dropdowns everywhere; updated rake to 0.9.0
|
2011-05-20 11:50:41 -07:00 |
|
danielgrippi
|
a02b9c01c8
|
eager loading aspect memberships
|
2011-05-13 18:22:42 -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 |
|
Raphael Sofaer
|
71e77d59b3
|
Revert to including all helpers everywhere, because the rest of the team prefers it that way
|
2011-05-12 13:54:55 -07:00 |
|
Raphael Sofaer
|
ab1f29c339
|
Working on styling the ContactsController#sharing
|
2011-05-10 14:17:43 -07:00 |
|
zhitomirskiyi
|
469d5b99a2
|
WIP added a share view, tests are red
|
2011-05-09 16:55:22 -07:00 |
|
danielgrippi
|
648a10e6d3
|
Merge branch 'master' into follow
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
|
2011-05-04 11:35:35 -07:00 |
|
Raphael Sofaer
|
a5f297d7f7
|
Don't include every helper everywhere, re-organize helpers
|
2011-04-28 10:38:33 -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 |
|
Raphael Sofaer
|
e6836c46a7
|
Remove unnecessary includes, finish renaming set_header_data, only run set_header_data on html requests
|
2011-03-09 17:50:46 -08:00 |
|
zhitomirskiyi
|
61dd5a835a
|
default scope on contact
|
2011-02-18 17:38:02 -08:00 |
|
zhitomirskiyi
|
16b7ec3990
|
pulled out share_with to be contact new and contact show
|
2011-02-17 18:05:21 -08:00 |
|
zhitomirskiyi
|
1e6bf9c80e
|
MS IZ the cucumber now passes
|
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
|
8c2e6dd8cb
|
aspect membership refactor complete
|
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 |
|