danielgrippi
|
89ca5cf337
|
DG DH; fix the build
|
2011-06-27 19:26:03 -07:00 |
|
danielgrippi
|
73fe74c834
|
updated selenium driver to work with FF5; added translations to contacts/index; fixed cucumber
|
2011-06-27 18:58:29 -07:00 |
|
danielgrippi
|
44b77c58a3
|
just have a remove from aspect icon when viewing an aspect in contacts index
|
2011-06-27 16:26:54 -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 |
|
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 |
|
danielgrippi
|
1c9ca738ae
|
green everywhere.
|
2011-04-08 17:10:43 -07: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
|
2e5b5e1efe
|
request notification emails -> started sharing notification emails
|
2011-04-06 13:21:15 -07:00 |
|
danielgrippi
|
68375fdb02
|
added mutual flag, removed pending from contact, specs are green. wip
|
2011-04-05 16:12:53 -07:00 |
|
danielgrippi
|
c4295a7693
|
fix aspect_memberships_controller specs
|
2011-03-30 11:15:40 -07:00 |
|
danielgrippi
|
95578e79c6
|
fix removing from aspect -> contact removal bug
|
2011-03-30 10:44:55 -07:00 |
|
MrZYX
|
55417cf9e3
|
AspectsController#move_contact -> AspectMembershipsController#update
|
2011-03-27 13:29:36 +02:00 |
|
MrZYX
|
b689d4695b
|
refactor of routes.rb done so far; further refactor needs design decisions
|
2011-03-27 00:05:35 +01:00 |
|
danielvincent
|
090c412690
|
touched up AspectMembership resource
|
2011-03-01 12:14:31 -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 |
|