Commit graph

27 commits

Author SHA1 Message Date
danielgrippi
5e1d1428d0 fix styles 2011-08-05 17:29:57 -07:00
danielgrippi
eb6d4c0228 remove dropdown from h4 2011-08-05 17:24:54 -07:00
danielgrippi
cd62064846 touched up aspect/edit and friend finder popups 2011-08-05 17:14:07 -07:00
Raphael Sofaer
6d3da0d0d1 Memoize the facebook invitation form on the facebook finder page 2011-08-05 11:31:45 -07:00
Maxwell Salzberg
001d4ceaff fix friend finder styling 2011-08-03 18:55:26 -07:00
Maxwell Salzberg
520b0dcf33 only show resend link 2011-08-03 18:18:00 -07:00
Maxwell Salzberg
275be550f8 aspects is not an li 2011-08-03 18:14:49 -07:00
Maxwell Salzberg
099d882814 fix aspect dropdown when friend on diaspora 2011-08-03 17:38:30 -07:00
Maxwell Salzberg
7e8f17cc31 refactoring this stuff 2011-08-03 16:58:55 -07:00
Maxwell Salzberg
86f4f983f6 move all aspects to be a method, and cleaned up some sockets helper uglyness ms iz 2011-06-16 11:17:14 -07:00
danielgrippi
16351227f7 use aspect dropdowns everywhere; updated rake to 0.9.0 2011-05-20 11:50:41 -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
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
danielgrippi
cbdbe1b29b follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
zhitomirskiyi
821703f4d4 fixed url. photo 2011-03-21 14:56:50 -07:00
zhitomirskiyi
93d69c4ec7 fixed the views for the friend finder 2011-03-21 14:56:50 -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
43fc2c4d63 fixed the style on the share with list element 2011-03-17 15:19:12 -07:00
zhitomirskiyi
2b6165d8ea wip 2011-03-17 14:32:07 -07:00
zhitomirskiyi
433db9fc8b wip, still need to auto hide, and expand on click the contact setting, styling, also would be nice to cache the friend list, and maybe on login queue up a job to refresh it 2011-03-17 14:32:06 -07:00
zhitomirskiyi
1296dde15b this should speed up the finder 2011-02-09 22:39:13 -08:00
zhitomirskiyi
41d21c78ef mend 2011-02-08 18:53:18 -08:00
zhitomirskiyi
6be63b88f0 added the pending request to the finder 2011-02-08 18:53:18 -08:00
zhitomirskiyi
4e96d11cd0 Revert "refactored local person person friend finder functionality to use the partial"
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.

Conflicts:

	app/views/services/_remote_friend.html.haml
	app/views/users/getting_started/_step_3.html.haml

refactored invitations, added them to the last page

fixed styling on adding an aspect to the aspect list

added a facebook for person edit aspect memberships

touched up and simplified sign-up flow

fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a invitation text
setting the invites

added requests to the fb hash

finder has options

remove the requester from the list

typo

making a block

another typo

remove the if statement for the notifications

checking on the right field

translations and correct indenting

fixed stuff added

added a temp puts

added a temp puts

now actually referencing the service

not double nesting

remove stream element

updated remote friends to old style

removed it from the h1 block

putting the stream element back
2011-02-08 16:40:32 -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
Raphael
7339e46bfb Moving remote friend view out to a partial 2011-01-28 16:42:43 -08:00