danielgrippi
75f3accd37
moved facebook friend inviter/finder into contacts layout & re-added search
2011-08-12 17:05:01 -07:00
Raphael Sofaer
c38c744156
Fix contact search in the facebook friend finder.
...
It was looking for #contact_list_search instead of .contact_list_search.
2011-08-05 12:34:48 -07:00
danielgrippi
7b7f3fc086
fix up aspects/edit popup a little
2011-07-10 18:34:47 -07:00
danielgrippi
7893129435
prevent user from hitting aspectmemberships controller before response on dropdowns
2011-05-11 17:07:58 -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
804b6cc490
Clean up some JS
2011-04-21 12:48:31 -07:00
danielgrippi
1c9ca738ae
green everywhere.
2011-04-08 17:10:43 -07:00
zhitomirskiyi
aa5bef0c3f
calls the job on login does a sync call if the cache friends was not called before, fixed the views
2011-03-21 14:56:50 -07: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
zhitomirskiyi
9f239789b9
can remote the person from the last aspect from edit contact pane
2011-02-11 12:58:01 -08:00
Raphael Sofaer
c1844c9be2
Merge remote branch 'lfortin/js-formatting'
...
Conflicts:
public/javascripts/web-socket-receiver.js
2011-02-11 11:31:30 -08:00
zhitomirskiyi
1da965616b
added an option to remove a contact from the last aspect, after a prompt
2011-02-09 17:47:27 -08:00
zhitomirskiyi
df4ebb286d
accept invitation feature passing
...
wip, added a form to add aspect to the contact list
added files
typo
render the partial
remote friend
specifying the provider for the route
refactored local person person friend finder functionality to use the partial
typo
trying to use the stream
2011-02-08 16:40:28 -08:00
zhitomirskiyi
7241177421
translating the warning about removing the person from the last aspect
2011-02-08 15:44:12 -08: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
danielvincent
98bcad5c59
visual fixes on people/show. contact count on aspect filters. contact list searches again.
2011-01-08 13:11:54 -08:00
lfortin
62585aa445
more JS formatting
2011-01-02 19:41:20 -05: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
Raphael
baa04ceac7
Add aspect list to contact page
2010-12-13 15:58:08 -08:00
danielvincent
3ada121d0b
contact-js as its own file
2010-11-28 00:29:22 -05:00
