Commit graph

794 commits

Author SHA1 Message Date
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
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
Raphael
6da410079b Commented-on posts bubble up to the top 2010-12-01 15:38:56 -08:00
Raphael
8d853a88a3 Remove some old views, clean up routes, clean up. 2010-12-01 15:38:56 -08:00
Raphael
f0df1ec8df Remove dev utilities controller 2010-12-01 15:38:56 -08:00
Raphael
c07b9b1874 Fix rest of specs 2010-12-01 15:38:56 -08:00
Raphael
836b5685f7 Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post 2010-12-01 15:38:56 -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
017251fef9 Added genderized variants of t() to views, controllers and helpers. 2010-12-01 18:19:48 +01:00
Paweł Wilk
279b08ae4a Added inflection of nouns by the grammatical gender for some languages.
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
2010-12-01 17:29:04 +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
Raphael
f2cb43bb4e Take queries out of aspect contacts pane on home page 2010-11-30 15:58:07 -08:00
Raphael
d733d2c3bf Take out print statements 2010-11-30 15:51:37 -08:00
Raphael
366734ca5e Take queries out of aspect contacts pane on home page 2010-11-30 15:35:32 -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
03e3c3a202 Render comment partial with collection option 2010-11-29 17:50:30 -08:00
Raphael
ec6f42eaf0 Take JS out of landing page 2010-11-28 16:47:41 -08:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
Raphael
5041a84882 Fix immediate response on status_message create 2010-11-28 00:23:53 -05:00
Raphael
5b29cff56a Take out comment rendering logging 2010-11-27 23:46:13 -05:00
Raphael
6d6b07fb92 Use form_tag, not form_for, in _new_comment 2010-11-27 23:24:29 -05:00
danielvincent
f59c6e2427 refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now. 2010-11-27 23:06:34 -05:00
Raphael
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
maxwell
62b4e85b0b DG MS move dispatch post to EM::next_tick in controller so the post response returns to the poster much faster. also fixed a bug in the logs refrencing an object that did not exsist 2010-11-27 16:20:46 -05:00
danielvincent
a932547d12 minimizing some queries in the views. only select aspect names and ids in application controller. 2010-11-27 01:05:55 -05:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
Raphael
77d46b2d66 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-26 17:09:38 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
danielvincent
bf66be9ea4 fixed template error on statusmessage controller 2010-11-26 13:29:49 -05:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
danielvincent
94d08954d9 401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation. 2010-11-26 00:19:19 -05:00
danielvincent
e56df5c159 fixed issue rendering partial for a comment in comments#create 2010-11-25 23:34:59 -05:00
Michael Sofaer and Raphael Sofaer
e8a266b6dd Make the getting_started aspects page more like the manage page 2010-11-25 23:17:27 -05:00
Raphael
6e14018abb Fixing http referer 2010-11-25 19:50:14 -05:00
zhitomirskiyi
037f822287 removed the puts 2010-11-25 19:37:05 -05:00
zhitomirskiyi
421078bd0b if you create an aspect from the aspect manage page it redirects back there 2010-11-25 19:37:05 -05:00
zhitomirskiyi
a2d3a940a6 removed the puts 2010-11-25 16:20:09 -08:00
zhitomirskiyi
de75617070 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-25 16:19:30 -08:00
zhitomirskiyi
16d023e800 if you create an aspect from the aspect manage page it redirects back there 2010-11-25 16:18:39 -08:00
Raphael
a061999e30 Don't inspect people in logging statements 2010-11-25 18:03:34 -05:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
Sarah Mei
fa602cabf2 fix messaging around invitation success/failure 2010-11-24 09:34:05 -08:00
danielvincent
d7609ef647 fixed issue with photos#index not recognizing an already sent request. 2010-11-23 21:03:35 -08:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
maxwell
52b02176db invited users seed aspects 2010-11-23 11:07:33 -08:00
MrZYX
ed3dc10f79 various fixes to translations - i like downcased keys only :P - made stuff translatable - cleaned up en.yml a bit 2010-11-23 14:02:13 +01:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
maxwell
0965b45f23 fixing getting started 2 2010-11-22 18:28:04 -08:00
danielvincent
0e7b1f5eb7 status messages and comments made by user will ajax onto the current page, and websocket everywhere else. 2010-11-22 14:52:13 -08:00
zhitomirskiyi
7df35ade12 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -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
f4ff48f5c0 commenting out mobile for now. photos now post from only a users photos 2010-11-22 10:26:00 -08:00
danielvincent
55952d00c0 fixed failing photoscontroller spec. 2010-11-21 22:58:24 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
752d50a6a9 editing captions on photos uses remote forms. removed photo in album from WSR. 2010-11-21 19:51:20 -08:00
maxwell
c4a270ef8b putting mobile interface back in so we can get it cleaned up 2010-11-21 17:14:43 -08:00
danielvincent
069b372c19 photo show links to original post and siblings. status message shows all photos associated with it. youtube player makes http/s call instead of just http. 2010-11-21 16:30:47 -08:00
danielvincent
d16a4601c2 contact list on aspect#show is ajaxy 2010-11-21 16:30:46 -08: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
maxwell
769c0e1055 DG MS trying to finish statusmessage refactor 2010-11-21 16:13:01 -08:00
maxwell
ea7bdfde28 fix validation and order of status message sent 2010-11-21 16:13:01 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
maxwell
7f97b6f812 MS DG form now works reasonably well. still need to limit number of photos 2010-11-21 16:13:00 -08:00
maxwell
fb0dc2db7e added photos to status messages 2010-11-21 16:13:00 -08:00
maxwell
7fb751b00c making photo uploader work better 2010-11-21 16:11:55 -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
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -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
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -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
7876da8fb8 Refactor raises in requesting to validations in request, move to better controller structure 2010-11-16 16:18:16 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
danielvincent
988e2afe3d resolved missing translation, tweaked button css, commented out mobile_fu in application controller 2010-11-13 00:26:55 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -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
danielvincent
85e2316280 Add a contact pane on aspects#show altered to also allow removal of existing contact from aspect 2010-11-11 19:41:12 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy"
This reverts commit cb9fb0ad94.
2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
7d6be51cfb making photos#show be in no aspect 2010-11-08 17:53:47 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00