Raphael
3a4caca397
Fix photo uploading in profile photos, style photo upload button better
2010-12-09 13:06:31 -08:00
Raphael
b8589c457d
Refactor people edit page, now using form_tag
2010-12-09 13:03:30 -08:00
danielvincent
cdd225c076
don't show new comment form on a non-contact's post
2010-12-08 18:23:30 -08:00
danielvincent
46793179db
people#show displays shows public posts for non-contacts as well
2010-12-08 16:53:24 -08:00
Raphael
32a2264af5
Refactor peoplecontroller index
2010-12-06 13:36:20 -08:00
maxwell
0a8af9e72b
DG MS some fixes for getting started
2010-12-04 23:05:47 -08:00
Raphael
3ee246d873
Merge branch 'resque-receive'
...
Conflicts:
Gemfile.lock
2010-12-02 19:42:05 -08:00
maxwell
2fbf2ddd6f
you dont have a pending request from everyone
2010-12-02 16:09:55 -08:00
Raphael
8798f05ff7
Revert "Revert redis merge to fix bugs on master"
...
This reverts commit 30698d674b
2010-12-02 15:33:26 -08:00
Raphael
30698d674b
Revert redis merge to fix bugs on master
2010-12-02 15:20:27 -08:00
Raphael
c76f38ca23
Write webfinger job for search
2010-12-02 12:35:26 -08:00
Raphael
db0106f13c
Rename EMWebfinger to Webfinger, clean up some related things
2010-12-02 12:35:25 -08:00
maxwell
119599bfeb
Revert "Commented-on posts bubble up to the top"
...
This reverts commit 6da410079b
2010-12-02 09:51:26 -08:00
Raphael
6da410079b
Commented-on posts bubble up to the top
2010-12-01 15:38:56 -08:00
Josh Lubaway
ecd1d2ecd6
Bug #624 Can't unset birthday
...
This change allows users to "unset" their birthday.
Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.
Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
2010-11-30 21:23:47 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
Raphael
f44b02e22c
Clean up people/person
2010-11-30 13:07:02 -08:00
Raphael
fce428826c
Try to take photos query out of views
2010-11-29 23:41:03 -08:00
Raphael
d2bfffca92
Fix PeopleController, add specs
2010-11-27 21:46:07 -05:00
danielvincent
d7609ef647
fixed issue with photos#index not recognizing an already sent request.
2010-11-23 21:03:35 -08:00
danielvincent
857a4b5f11
photo large is now at 300px. a person's profile photo now references the larger size instead of medium.
2010-11-22 10:32:14 -08:00
maxwell
769c0e1055
DG MS trying to finish statusmessage refactor
2010-11-21 16:13:01 -08:00
danielvincent
242d0ab9c5
a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.
2010-11-21 16:11:55 -08:00
zhitomirskiyi
0e171e8504
added a fixed the pending request query
2010-11-18 15:22:14 -08:00
Raphael
37a694ed1f
Added rescues to many of the webfinger methods and made EM-HTTP-Request follow 3 redirects
2010-11-17 18:49:03 -08:00
Raphael
5e269edb5a
Adding logging to webfinger in people_controller
2010-11-17 15:56:39 -08:00
Raphael
6c97899d5d
Add logging statements, rescue callbacks in em-webfinger
2010-11-17 13:55:58 -08:00
Raphael
e2412d2e43
Add error messages for friending from aspect-manage
2010-11-16 18:00:55 -08:00
Raphael
c0414b8184
Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts
2010-11-16 16:18:16 -08:00
Raphael
248e768846
search now sockets a person
2010-11-15 19:13:45 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
maxwell
a84f9437b0
trying another thing to get the redirect working
2010-11-08 17:43:59 -08:00
maxwell
2162a2e3f9
collapse person's photos and status message into their profile; also, made these nested on a person
2010-11-08 15:55:58 -08:00
Raphael
8023b6f344
Check for birthday before putting in birthday paramaters
2010-11-05 18:32:18 -07:00
maxwell
4a39d1a516
date now has a default nil value
2010-11-05 17:38:51 -07:00
maxwell
4300b20c34
cleaned up profile page a bit more
2010-11-05 14:28:39 -07:00
Raphael
1bba4c60f7
Merge remote branch 'MrZYX/untranslated-strings'
...
Conflicts:
app/views/aspects/manage.html.haml
config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -07:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
Raphael
5cdeed6c54
Add a spec to people_controller, make those specs a little clearer
2010-11-02 17:10:19 -07:00
Sarah Mei
ce213513eb
PeopleController#update handles getting an empty string for :image
2010-10-31 17:49:47 -07:00
danielvincent
8ec49e685b
going to a non-friend's page contains a way to add them.
2010-10-29 15:43:44 -07:00
danielvincent
7acc138a21
resolved issue regarding profile images referenced at https:// locations.
2010-10-29 14:56:41 -07:00
danielvincent
6eb50ea934
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
2010-10-29 14:11:59 -07:00
danielvincent
79ec02c6ad
photo uploader on edit profile page.
2010-10-29 14:11:59 -07:00
danielvincent
bb9a6e47a4
added birthday and gender to Profile. fixed a view issue on getting_started#2
2010-10-28 11:01:16 -07:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
danielvincent
cd726c0ba7
users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/
2010-10-27 12:21:25 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
danielvincent
385e1673ab
Merge branch 'master' into getting-started
...
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
2010-10-26 16:50:57 -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
ilya
c27f05ed42
Initial refactor done, need to stop mapping user.friends to people so much
2010-10-22 18:11:04 -07:00
danielvincent
e4d6e170e3
aspect tab no longer selected on user#edit and person#show, person#index
2010-10-20 10:22:29 -07:00
maxwell
e1dd0cf6be
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
2010-10-13 23:49:13 -07:00
danielvincent
9162a4a168
DG MS; 404 show pages for objects that don't exist for given user
2010-10-11 11:32:20 -07:00
Raphael
1d463d22a1
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
ilya
7852c346f2
mode the visible posts api more general and moved to it on the public controller
2010-09-27 18:31:37 -07:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
danielvincent
af9cda52af
DG IZ; always query through the current_user in the controllers.
2010-09-20 13:18:11 -07:00
maxwell
649839567d
MS added pagination to the search page
2010-09-16 11:47:34 -07:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
Raphael
17be027738
redirect to root instead of search
2010-09-10 16:52:28 -07:00
Raphael
b704704334
People index now works when there is a non-friend on the page
2010-09-10 16:49:09 -07:00
Raphael
aa1f3c6438
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
2010-09-10 10:31:23 -07:00
maxwell
919d7d23c0
MS fixed log view; also, now pagination is now working, check out the new method which returns plucky queries instead of arrays
2010-09-06 17:46:09 +02:00
Daniel Vincent Grippi
5e34506df6
added custom as_json methods to models
2010-08-29 23:46:19 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7
controller cleanup: using respond_to and respond_with.
2010-08-29 22:49:13 -07:00
Raphael
5ff1bdae90
Groups can now be batch edited
2010-08-27 12:23:20 -07:00
danielvincent
390bf24e14
Don't try to put yourself in any groups
2010-08-26 17:34:06 -07:00
maxwell
b4174c664e
you can now reassign a peson's group
2010-08-25 18:07:31 -07:00
maxwell
204c910f66
MS fixing small bugs, adding a very dump list of a groups that a friend is in for you
2010-08-24 15:47:44 -07:00
maxwell
5d25861dc6
IZ MS person profile page now displays only posts a user can see
2010-08-19 10:46:47 -07:00
danielvincent
2409fd3f20
user page doesn't give an error anymore. fixed visible_person_by_id to return self.person instead of self
2010-08-18 02:40:53 -07:00
Raphael
48756e77f3
Friend_by_id changed to visible_person_by_id
2010-08-17 19:32:42 -07:00
Raphael
2c1c5df281
Moved search specs, renamed method
2010-08-17 10:24:59 -07:00
Raphael
3a591b0713
Merging in friend-refactor...
2010-08-16 15:35:14 -07:00
Raphael
d7a9c3c087
Take out another couple friends.first and replace with friend_by_id
2010-08-16 12:18:36 -07:00
Raphael
6ae4c31e05
Person show should be scoped through user
2010-08-16 11:18:52 -07:00
ilya
ac40f7974e
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
2010-08-13 18:37:09 -07:00
maxwell
7be374ac48
MS IZ fixed a couple of view things as well as the dev db seed script
2010-08-09 10:10:41 -07:00
maxwell
f4ca29da41
PeopleController now renders json when given a query. Unfortunately, it only renders the matching friend ids without first or last names...
2010-08-06 17:19:33 -07:00
maxwell
58de12df5e
DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)
2010-08-06 16:35:02 -07:00
maxwell
bdca2348a6
MS IZ profile page has more useful info, but ultimatly kinda ugly
2010-07-27 14:23:31 -07:00
maxwell
d37461a432
ms dg post deletions now come thru the socket again
2010-07-09 19:27:39 -07:00
maxwell
23057869e1
DG MS debugging friend request
2010-07-09 18:41:39 -07:00
maxwell
db1811eb61
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
2010-07-08 14:14:03 -07:00
maxwell
1fa2dfd6eb
DG MS cleaning up friend request
2010-07-08 12:05:06 -07:00
danielvincent
3d105e7c1e
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
2010-07-07 16:53:52 -07:00
