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
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
4f3d031e89
Always set translations
2010-11-30 15:58:25 -08:00
Raphael
3dc3efc103
Move aspect contacts pane js to public
2010-11-30 15:57:32 -08:00
Raphael
bfcae7fd80
Always set translations
2010-11-30 15:44:27 -08:00
Raphael
366734ca5e
Take queries out of aspect contacts pane on home page
2010-11-30 15:35:32 -08:00
Raphael
57485e7093
Move aspect contacts pane js to public
2010-11-30 13:55:37 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
Raphael
a683512e6e
Take queries out of reshare
2010-11-30 13:31:48 -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
Raphael
93bbfd19d2
Move back to image link helper, but static
2010-11-30 13:07:02 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Maxwell Salzberg
7bce44ef28
remove brandon from author_info
2010-11-30 12:30:36 -08:00
Raphael
b5ed2ec5b0
Actually use the photos set in the controller
2010-11-30 12:25:56 -08:00
Raphael
49e8347aa3
Use static helper for aspect links
2010-11-30 12:23:43 -08:00
Raphael
b84d2bcc56
Don't use owns? in streamelement
2010-11-30 11:58:41 -08:00
Raphael
b0522535ac
Take queries out of reshare
2010-11-30 11:43:27 -08:00
Raphael
fce428826c
Try to take photos query out of views
2010-11-29 23:41:03 -08:00
maxwell
2d3f2df1fd
dont use object_path
2010-11-29 19:57:20 -08:00
Raphael
03e3c3a202
Render comment partial with collection option
2010-11-29 17:50:30 -08:00
maxwell
17a890676e
added a link in footer to this instances code. obey the agpl yo.
2010-11-29 16:46:43 -08:00
maxwell
96776f93f9
we need this for socketing... sorry
2010-11-29 16:19:36 -08:00
maxwell
e7fb70cdd1
we need this for socketing... sorry
2010-11-29 16:00:25 -08:00
maxwell
9707c5a124
remove single comment partial for speed in rendering
2010-11-29 15:47:24 -08:00
Hexagon
b0ff8f0f60
Mini refactor, removed terse_url function
2010-11-29 23:23:51 +01:00
MrZYX
8ffa5df927
Merge branch 'master' of https://github.com/masterdot/diaspora into masterdot-master
2010-11-29 22:01:13 +01:00
Raphael
760fed7016
No need for defined?
2010-11-29 12:10:41 -08:00
masterdot
09d82fd08d
fix for intendation
2010-11-29 12:46:13 +01:00
masterdot
35feccbb2c
added support for tracking via piwik.
...
if piwik_id is not set no javascript will be included. it may be both enabled, aganalytics and piwik.
2010-11-29 10:26:47 +01:00
danielvincent
2c22941e2f
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
2010-11-28 20:16:57 -05:00
Raphael
ec6f42eaf0
Take JS out of landing page
2010-11-28 16:47:41 -08:00
Raphael
812aaae63f
Simplify stream_element partial
2010-11-28 11:31:31 -05: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
danielvincent
017075e480
actually include the javascript in the view...
2010-11-28 00:36:46 -05:00
danielvincent
3ada121d0b
contact-js as its own file
2010-11-28 00:29:22 -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
Raphael
68c0682ed0
Take a query out
2010-11-27 22:21:15 -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
Raphael
7b3aac923a
Take image_tag out
2010-11-27 18:05:47 -05:00
Raphael
8e2c74bdd2
Take out link_to for real
2010-11-27 17:28:18 -05:00
danielvincent
d65ba2f291
removing contact pictures from contact list re aspects#show
2010-11-27 17:25:40 -05:00
Raphael
c46b6d80aa
Correct math, take out link_tos
2010-11-27 17:07:35 -05:00
