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
MrZYX
56a6f0e43b
cleaned up craziness in users and likes routing, fixed #961
2011-03-24 03:02:14 +01: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
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08: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
07850c7cb2
fix fb finder, flesh out test
2011-01-28 17:13:20 -08:00
Raphael
8151f3b540
correct partial name
2011-01-28 16:54:30 -08:00
Raphael
7339e46bfb
Moving remote friend view out to a partial
2011-01-28 16:42:43 -08:00
zhitomirskiyi
a8ac403e30
share with action for people who are already on diaspora
2011-01-28 16:37:11 -08:00
MrZYX
cbfefc8fc3
fixed some untranslatable strings, thanks to Nygu
2011-01-27 21:04:03 +01:00
zhitomirskiyi
0ba9889025
removed bug in finder view
2011-01-26 18:50:02 -08:00
zhitomirskiyi
2b8635f0aa
hide share request button for people already on diaspora in friend finder (for now)
2011-01-26 18:44:17 -08:00
zhitomirskiyi
1bb5f9f983
only allow invites if invite count > 0 for current user
2011-01-26 18:08:57 -08:00
zhitomirskiyi
9bd6b11ddf
made facebox wider, remove disable with, added default profile photo for those not connected to diaspora
2011-01-26 17:50:49 -08:00
zhitomirskiyi
8941448866
placed friend finder in facebox. added translations
2011-01-26 17:44:40 -08:00
zhitomirskiyi
a610618057
display resend link if already sent invitation in friend finder
2011-01-26 16:57:39 -08:00
zhitomirskiyi
9e22f4a6e6
checks if you already invited the person
2011-01-26 16:31:34 -08:00
zhitomirskiyi
1a911a8b99
translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier)
2011-01-26 16:01:57 -08:00
zhitomirskiyi
ab41a5f24a
friend finder has invite buttons and aspect dropdowns
2011-01-26 13:03:53 -08:00
zhitomirskiyi
e56ba84094
friend finder basic styling
2011-01-26 12:16:47 -08:00
zhitomirskiyi
cf45f31712
facebook friend finder is now contact-aware
2011-01-26 12:16:47 -08:00
zhitomirskiyi
d976bf0966
fixed bug in facebook service finder
2011-01-26 12:16:46 -08:00
zhitomirskiyi
f3f38cf4fd
fetch person object associated with facebook id in friend finder
2011-01-26 12:16:46 -08:00
zhitomirskiyi
8bc52cdb55
facebook friend finder gathers fb friends.
2011-01-26 12:16:46 -08:00
danielvincent
c9b498d59c
resolved 500 page on getting_started#step_3
2010-12-11 12:05:58 -08:00
MrZYX
0374ee436e
fixed untranslatable strings
2010-12-10 16:52:35 +01:00
danielvincent
5731f32cfe
add correct page titles
2010-12-09 20:09:20 -08:00
maxwell
a4336a8e72
moar tests for services
2010-12-09 19:29:25 -08:00
danielvincent
c9c84794af
fixed build. publisher lights up on hover on aspect#index page. updated login page text.
2010-11-23 03:10:47 -08:00
MrZYX
ca72bb40a6
refactored en.yml
...
removed unused keys out of en.yml
replaced some ' with "
2010-11-12 06:04:05 +01:00
maxwell
80c8451bf2
fixing translation text of services page
2010-11-08 10:25:11 -08:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
Hexagon
bba3aaa684
Translating a huge amount of untranslated strings
2010-10-30 15:25:42 +02:00
danielvincent
06654b13b2
posts don't socket into services#index anymore.
2010-10-27 22:55:58 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
maxwell
a992c5fbc2
dont show service if you dont have the keys for it. also, update deploy script
2010-10-25 22:06:53 -07:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
