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
Dan Hansen
fc25c9bedb
Flash message handling is now a widget
2011-05-08 10:53:09 -05: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
804b6cc490
Clean up some JS
2011-04-21 12:48:31 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
Raphael Sofaer
fa59be2353
Another bit of JS cleanup
2011-04-08 16:11:13 -07:00
MrZYX
f194166841
moar garbage for you aka fixed #1005
2011-04-08 17:46:45 +02:00
MrZYX
75629018db
you want the id in aspect_memberships#destroy to be garbage? There you go… (btw. fixed #1006 )
2011-04-08 17:40:59 +02:00
MrZYX
95de299e6e
fixed #953
2011-04-06 14:18:33 +02:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -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
Dan Hansen
b209fd0c2c
our spec would complain about the data of the ajax request not being there, move it into the callback instead
2011-01-22 12:40:20 -06:00
Dan Hansen
8619a2035c
green for the night
2011-01-22 01:16:52 -06:00
Dan Hansen
c23811e1ab
flash the user whether or not that person was moved to a different aspect
2011-01-21 20:02:42 -06:00
Dan Hansen
8103e66ea3
didn't mean to commit some changes in aspect-edit.js
2011-01-14 14:57:26 -06:00
Dan Hansen
d4f30ded1b
Diaspora.js 2.0, added an official widget, don't use native alerts anymore
2011-01-14 14:54:44 -06:00
Dan Hansen
4ccf51b3d3
fix real time aspect name changing
2011-01-14 13:29:55 -06:00
danielvincent
f2f3059d72
fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl
2011-01-08 17:17:37 -08:00
danielvincent
71ca93720b
contact lists functional on aspects/index. edit panes facebox in from header
2011-01-08 13:11:53 -08:00
Sarah Mei
a1b92f5224
Merge javascript formatting changes.
2010-12-28 20:31:49 -08:00
Sarah Mei
de502bf67c
Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec.
2010-12-24 18:39:20 -08:00
Sarah Mei
9c50f900ed
Merry Christmas! I got you someting green.
...
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
2010-12-24 14:14:24 -08:00
lfortin
0393ac5a6f
more JS formatting
2010-12-19 00:15:00 -05:00
Laurent
4515ba631f
some JS refactoring
2010-12-15 19:25:35 -05:00
maxwell
efee7682e2
aspect rename now works
2010-12-08 13:11:13 -08:00
danielvincent
6c05d01177
enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index.
2010-12-02 17:36:46 -08:00
danielvincent
2c22941e2f
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
2010-11-28 20:16:57 -05:00
danielvincent
05174436c0
comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).
2010-11-28 18:51:27 -05:00
Sarah Mei
050918a310
Added link to manage aspects page from sidebar.
...
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
2010-11-25 10:29:35 -08:00
Sarah Mei
c19ebcece3
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
2010-11-17 22:28:24 -08:00
Sarah Mei
45e47513c2
AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly
2010-11-14 21:49:36 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
Sarah Mei
6c439608f0
started specs for AspectEdit.deletePersonFromAspect
2010-11-12 17:04:15 -06:00
Sarah Mei
506d13335a
Finally have complete specs for AspectEdit.onDropMove.
2010-11-12 16:05:17 -06:00
Sarah Mei
b77547e940
Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend
2010-11-12 14:51:16 -06:00
Sarah Mei
feec6d971d
More specs for aspect edit JS
2010-11-12 13:40:23 -06:00
danielvincent
be916384a1
collapsed remove from aspect and remove person into one function on aspects#manage
2010-11-04 17:50:48 -07:00
Sarah Mei
dbdd6884a7
SM MS jasmine specs for aspect edit
2010-11-03 22:19:20 -07:00
Sarah Mei
fad9c09212
refactor aspect-edit.js in prep for jasmine testing
2010-11-02 13:37:27 -07:00
OhaiBBQ
a548ab1345
Small optimizations
2010-11-01 14:58:53 -07:00
danielvincent
d8ca91769f
dragging a person to Remove from Aspect on aspect#manage fades person correctly (re: #442 )
2010-10-26 13:03:45 -07:00
danielvincent
ff13cad116
names of people display immediately on aspect#manage page
2010-10-26 12:19:32 -07:00
danielvincent
c0423e5e56
reverting commit manually
2010-10-22 15:57:00 -07:00
danielvincent
829ad6360a
multiple dropzones function. person image does not copy, delete is disabled.
2010-10-22 15:56:28 -07:00
danielvincent
a52870b21c
improved animations
2010-10-22 15:56:28 -07:00
danielvincent
e1f4e12b8f
style. also, made sense of aspect-edit.js
2010-10-22 15:56:28 -07:00
danielvincent
69528b95a3
removed ignore bucket. people now have x's to delete them
2010-10-22 15:56:27 -07:00
ilya
30bae4f807
throws an alert if you try to remove person from the last aspect
2010-10-20 18:30:22 -07:00
ilya
6fa82490c9
remove friend from aspect box, with js call to remove the person from the aspect
2010-10-20 17:34:52 -07:00
