Commit graph

147 commits

Author SHA1 Message Date
danielvincent
47b6d66b83 fixed proportions in stream, etc. 2010-12-03 23:38:29 -08:00
danielvincent
7fdbc9015b swapped new invitation lightbox for a proper page. 2010-12-03 00:57:53 -08:00
danielvincent
30668bf2e6 visual touchups 2010-12-02 23:19:30 -08:00
Sarah Mei
967fcd9a52 Revert "Added genderized variants of t() to views, controllers and helpers."
This reverts commit 017251fef9.
2010-12-01 22:29:24 -08:00
Sarah Mei
d6e8873b64 Revert "View fixed after rebase according to latest changes."
This reverts commit 76edca1366.
2010-12-01 22:29:04 -08:00
Hexagon
5651ea1d33 Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations 2010-12-01 19:13:39 +01:00
Paweł Wilk
76edca1366 View fixed after rebase according to latest changes. 2010-12-01 18:23:21 +01:00
Paweł Wilk
017251fef9 Added genderized variants of t() to views, controllers and helpers. 2010-12-01 18:19:48 +01: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
danielvincent
601284a171 make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo. 2010-11-30 15:58:26 -08:00
danielvincent
fa66162de5 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	app/helpers/application_helper.rb
	app/views/comments/_comment.html.haml
	app/views/people/_person.html.haml
	app/views/shared/_stream_element.html.haml
2010-11-30 13:19:17 -08:00
Raphael
f44b02e22c Clean up people/person 2010-11-30 13:07:02 -08:00
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
maxwell
96776f93f9 we need this for socketing... sorry 2010-11-29 16:19:36 -08:00
Raphael
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Hexagon
702abddce3 1900 was too far back for rails, 1904 were accepted. 2010-11-27 14:13:29 +01:00
Hexagon
033eea9f50 Fixed #550, diaspora now support seniors up to 110 2010-11-27 14:02:42 +01:00
danielvincent
7c6d5b8d27 cleaned up right pane on aspects#all. moved edit_contacts_pane out to a partial -- translation locations need updating. 2010-11-25 23:14:45 -05:00
danielvincent
b5dbfc129c touched up aspect contact manage list, removed some unused sass. 2010-11-25 20:22:59 -05:00
Sarah Mei
aa4a61870c you can click on photos in manage aspects to see profiles 2010-11-24 22:09:14 -08:00
danielvincent
d7609ef647 fixed issue with photos#index not recognizing an already sent request. 2010-11-23 21:03:35 -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
e72f4e1da7 translatable status is good again
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
danielvincent
52cde14221 more touchups 2010-11-21 16:11:54 -08:00
danielvincent
2b54d9a0c5 adjusting more page structure. drafting about there. 2010-11-21 16:10:54 -08:00
Raphael
7db1da935a Stream is a class 2010-11-21 13:21:42 -05:00
MrZYX
6f5c3f3258 made recent changes translatable and cleanup up en.yml a bit 2010-11-19 17:25:45 +01:00
maxwell
466120cd58 fixing extra = 2010-11-18 20:07:57 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -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
MrZYX
6400dc244f fixing again. it's getting anoying 2010-11-12 06:06:16 +01:00
MrZYX
d91c26fb68 translated getting started, fixed #508 2010-11-12 06:06:15 +01:00
MrZYX
eef0901f36 unscoped fill_me_out 2010-11-12 06:04:05 +01:00
Raphael
d62a7c4ce2 Fix request views, refactor identical forms into partial. 2010-11-10 20:12:09 -08:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -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
maxwell
e5c2bb46f5 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:30:01 -08:00
danielvincent
a4df6a8a53 bugfix in peeople#_person partial displaying relationship status 2010-11-07 10:51:33 -08:00
danielvincent
f594fa1d80 Stream is its own partial, which takes a collection of posts 2010-11-07 10:38:00 -08:00
maxwell
a971985884 removed private info if you are not friends 2010-11-06 16:34:41 -07:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
maxwell
32ed7e3b0f forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have 2010-11-05 17:48:33 -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
maxwell
997f9ad8d0 making profile not look so bad 2010-11-05 00:54:09 -07:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00