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 |
|
Sarah Mei
|
d25847a626
|
Error message for duplicate email; add email validation spec.
|
2010-10-16 22:46:13 -07:00 |
|
Sarah Mei
|
83b23a0ffe
|
Error message for duplicate username; refactor User validation specs.
|
2010-10-16 22:36:26 -07:00 |
|
maelsoucaze
|
34b21e7543
|
French localization updates.
|
2010-10-16 17:19:19 +02:00 |
|
danielvincent
|
db31357172
|
another typo change
|
2010-10-15 11:16:04 -07:00 |
|
danielvincent
|
d18b59f3d3
|
typo fix
|
2010-10-15 11:12:12 -07:00 |
|
Raphael
|
0680c2b5a6
|
Merge remote branch 'maelsoucaze/fr-locales'
|
2010-10-14 17:43:27 -07:00 |
|
Raphael
|
ecc7a55f8b
|
Merge remote branch 'flea/master'
Conflicts:
.gitignore
|
2010-10-14 17:24:46 -07:00 |
|
Raphael
|
08e629668d
|
I18ning empty_messages
|
2010-10-14 16:55:00 -07:00 |
|
maelsoucaze
|
9134c4545c
|
Fixes and updates French (Informal Honorifics) localization.
|
2010-10-15 01:17:33 +02:00 |
|
maelsoucaze
|
753deedc65
|
Fixes and updates French (Formal Honorifics) localization.
|
2010-10-15 01:17:17 +02:00 |
|
danielvincent
|
32a0f60a2f
|
moved photos link to the side bar for now
|
2010-10-14 14:38:19 -07:00 |
|
Volkan Unsal
|
241d104bc1
|
change en to tr
|
2010-10-13 21:10:36 -04:00 |
|
ilya
|
36b9f66f60
|
the invited user keeps track of who invited them, limit on invites,
removed the invites controller test
|
2010-10-13 16:52:33 -07:00 |
|
ilya
|
324f14c719
|
setting the token to nil on accept of invite
|
2010-10-12 18:23:59 -07:00 |
|
ilya
|
bb7e2a9918
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 14:58:22 -07:00 |
|
ilya
|
007f6cfb6f
|
close account
|
2010-10-11 14:58:11 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
Volkan Unsal
|
73f06bb61b
|
add devise.tr.yml
|
2010-10-11 15:09:43 -04:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
Volkan Unsal
|
6d00b2ca8a
|
correct some spelling errors in Turkish translation
|
2010-10-10 23:49:36 -04:00 |
|
Volkan Unsal
|
35ad703a5b
|
Merge branch 'master' of http://github.com/diaspora/diaspora
|
2010-10-10 23:09:19 -04:00 |
|
Volkan Unsal
|
633048fbed
|
finished Turkish translation
|
2010-10-10 23:06:56 -04:00 |
|
Nick van der Burgt
|
09b38bb726
|
Added dutch locale
|
2010-10-08 09:11:04 +02:00 |
|
ilya
|
4ecda6ab8f
|
Merge branch 'master' of github.com:diaspora/diaspora into invites
Conflicts:
Gemfile
Gemfile.lock
|
2010-10-07 18:20:51 -07:00 |
|