danielvincent
d6bb5291bc
Revert "Merge branch '348-change-email' of https://github.com/mblog/diaspora into mblog-348-change-email"
...
This reverts commit 2ac54eeffe3a13657087
2010-12-13 17:16:56 -08:00
mblog
d0355fdd43
Feature #348 : Change Email
2010-12-13 22:14:52 +01:00
danielvincent
c9b498d59c
resolved 500 page on getting_started#step_3
2010-12-11 12:05:58 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -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
Raphael
b8589c457d
Refactor people edit page, now using form_tag
2010-12-09 13:03:30 -08:00
maxwell
10df61a504
order of birthday is now correct for US english, also, you birthday actually sticks on the getting started page
2010-12-08 16:35:48 -08:00
Hexagon
5c1c31b2b2
Final fix, really
2010-12-07 22:40:27 +01:00
Hexagon
d04e8eff00
Putting document.ready back
2010-12-07 22:38:02 +01:00
Hexagon
80c5c5c9f5
Cleaning up revert of #619 pull
2010-12-07 22:20:26 +01:00
Raphael
c320dae589
Add a cuke for being invited by someone
2010-12-05 00:15:37 -08:00
maxwell
0a8af9e72b
DG MS some fixes for getting started
2010-12-04 23:05:47 -08:00
danielvincent
34a1a35bf1
skip getting started is not ajaxy
2010-12-04 12:06:08 -08:00
danielvincent
7fdbc9015b
swapped new invitation lightbox for a proper page.
2010-12-03 00:57:53 -08:00
danielvincent
756824d072
removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec.
2010-12-02 18:42:21 -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
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
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
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
Dan Goldenberg
bfc1fa4da0
added getting_started text and new press logos
2010-11-22 21:07:01 -08:00
maxwell
0965b45f23
fixing getting started 2
2010-11-22 18:28:04 -08:00
maxwell
173ec5f73b
Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
...
This reverts commit c45893d07d
2010-11-22 17:11:34 -08:00
maxwell
1adf93ace1
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-22 16:40:01 -08:00
maxwell
c45893d07d
remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar
2010-11-22 16:38:10 -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
8c6f3bddc3
added diaspora handle to home page with help text. added email address to account settings page.
2010-11-22 11:19:50 -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
4ce337bbed
display a users username in the final step
2010-11-21 16:13:02 -08:00
maxwell
9f5ba1a1ea
added finished state to sidbar for getting started
2010-11-21 16:13:02 -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
Matt Baker
b2e6caafed
Don't show skip link if user.getting_started == false
2010-11-18 11:16:18 -08:00
maxwell
afc3bd63fe
added button to end of getting started
2010-11-17 11:30:22 -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
748efb1860
eliminated senseless duplicates in en.yml
2010-11-12 06:07:36 +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
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
e5c2bb46f5
reverse the years as they are displyed in the birthday dropdown
2010-11-08 10:30:01 -08: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
Raphael
4233e45bc5
Adjust wording
2010-11-05 11:23:21 -07:00
Sarah Mei
a230763879
gender is a text field
2010-11-04 22:02:27 -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
Derrick Camerino
087f7e90d4
removing aspect in ui only if ok is clicked on confirmation
2010-11-04 19:54:11 -07:00
Raphael
abebd18c98
Move getting_started self link color to a css class
2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed
Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
...
Conflicts:
config/locales/diaspora/en.yml
2010-11-04 18:56:43 -07:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
