danielvincent
020cd90341
aspect labels on people#show view
2010-11-06 11:09:11 -07:00
danielvincent
1a481d43d2
Use _stream_element.haml as a wrapper for posts in the stream.
2010-11-05 17:40:28 -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
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
MrZYX
63a5fdb000
made a bunch of strings translatable
2010-11-04 20:49:50 +01:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
MrZYX
80b8e5e42d
updated german locale (informal) to reflect latest changes
2010-11-02 12:12:47 -07:00
MrZYX
7cd6e3a868
updated german locale (informal) with keys from pull request 465
...
again with help of michiwend
2010-11-02 12:12:47 -07:00
MrZYX
b1c9961a72
updated german locale so no keys are missing (informal)
...
also added parts for german from the rails i18n project
still some parts missing, unclear or not translatable look at #FIXME's
even added translation that is missing in en.yml :P
thanks to michiwend for help
2010-11-02 12:12:47 -07:00
Raphael
bbd8cadc14
Retaining specs and line from robustdj's patch
2010-11-02 11:27:51 -07:00
Alec Leamas
fceffba261
Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor
2010-11-02 16:34:47 +01:00
Raphael
7244730961
Merge remote branch 'ed0h/fr-update'
...
Conflicts:
pkg/ubuntu/dist
2010-11-01 17:36:05 -07:00
Hexagon
938d146405
Common translations are used without the namespace
2010-11-02 00:07:24 +01:00
Raphael
41d839ecf4
Merge remote branch 'ecleel/master'
...
Conflicts:
pkg/ubuntu/dist
2010-11-01 15:39:38 -07:00
Hexagon
1acc206fa4
#475 : Fixed more untranslated strings
2010-11-01 22:22:13 +01:00
Hexagon
65419e423a
Added missing strings to swedish translation
2010-11-01 16:42:47 +01:00
J David Eisenberg
1a32766fb0
Issue #492 : Informal, vague description when signing up as a new user
2010-11-01 16:42:47 +01:00
Curtis J Schofield
f693a97bf3
i put in a dash
2010-11-01 16:42:46 +01:00
livefromthemoon@gmail.com
60f6e091d3
Added missing strings to french translation
2010-11-01 00:27:32 +01:00
J David Eisenberg
f54820f456
Issue #496 : Eliminate self-links in Getting Started
2010-10-31 12:16:07 -07:00
Abdulaziz Al-Shetwi
96906d9eaf
Retranslate arabic localization.
2010-10-31 14:14:48 +03:00
Hexagon
0bef839261
Translating a huge amount of untranslated strings
2010-10-30 15:24:26 +02:00
Alec Leamas
58ead768d6
Small fix
2010-10-30 09:58:01 +02:00
Alec Leamas
68cba5da98
Merge branch 'se-l10n-update-2' of http://github.com/Hexagon/diaspora into Hexagon-se-l10n-update-2
2010-10-30 09:54:28 +02:00
Raphael
555c15dfef
Simplify validations on user
2010-10-29 16:56:04 -07:00
Hexagon
99661a3240
Added swedish translations
2010-10-30 01:32:32 +02:00
danielvincent
8ec49e685b
going to a non-friend's page contains a way to add them.
2010-10-29 15:43:44 -07:00
Alec Leamas
94327264d4
Comments on Swedish diaspora terms, trailing blanks killed
2010-10-29 11:11:56 +02:00
Hexagon
09fb02ec9f
modified: config/locales/diaspora/sv.yml
2010-10-29 00:55:27 +02: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
Raphael
16e455958c
Merge remote branch 'hexagon/se-localization'
2010-10-27 11:08:06 -07:00
Raphael
f700eb537a
Add activemodel error message for person to en and fr locales
2010-10-27 10:27:30 -07:00
danielvincent
a8086f2990
further refinements. added back buttons, more explanation text.
2010-10-26 23:27:26 -07:00
Raphael
f975199f19
Merge remote branch 'mael/fr-locales'
2010-10-26 16:40:50 -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
Hexagon
1382bd9d08
Fixed header in swedish translation
2010-10-25 21:45:43 +02:00
Hexagon
d617392108
Added/complemented swedish translation
2010-10-25 21:41:32 +02:00
maelsoucaze
14ac908c3d
French localizations updates.
2010-10-25 00:06:05 +02:00
maelsoucaze
294c8849b9
Merge remote branch 'upstream/master' into fr-locales
2010-10-25 00:04:24 +02:00
maxwell
bc9c852e25
fixed translation showing en on person show page when the person had no posts
2010-10-20 17:52:07 -07:00
ilya
94a7a3c6ad
IZ MS; deleted move_friends removed
2010-10-20 14:26:45 -07:00
Joseph Method
4b588ccefb
Addresses [ #380 ] and [ #239 ] by handling the errors from bad identities
2010-10-19 23:44:43 -04:00
danielvincent
0621aa2f6c
fixed no friends/posts message positioning
2010-10-19 12:28:54 -07:00
danielvincent
ea00d35f1f
padding on stream fix. added add aspect button in aspect nav.
2010-10-19 12:10:22 -07:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00
Joseph Method
e3e4a6b319
Continuation of previous commit
2010-10-17 19:07:54 -04:00
Sarah Mei
f688653936
disallow whitespace in username
2010-10-16 23:34:58 -07:00
