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 |
|
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 |
|
Raphael
|
2bb36a266a
|
Merge remote branch 'minilibra/master'
|
2010-10-07 17:32:20 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
bd9e9043e0
|
fixed nb locale
|
2010-10-07 14:37:38 -07:00 |
|
minilibra
|
ae6f39a0d0
|
Localization file for Indonesian added. Change "en" at the top of both files to "id". Thanks to rsofaer.
|
2010-10-08 02:09:13 +07:00 |
|
Raphael
|
e47aa90b15
|
Merge remote branch 'Stigjb/master'
|
2010-10-07 11:06:27 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
Raphael
|
0831812e97
|
Merge remote branch 'kashif/master'
|
2010-10-07 10:41:50 -07:00 |
|
Yaron Shahrabani
|
77d5b68e15
|
Fixed some typos
|
2010-10-06 08:29:58 +08:00 |
|
Daniele Di Sarli
|
5074d2f8f2
|
Updated Italian translation
|
2010-10-06 08:25:29 +08:00 |
|
UserAd
|
1d0a4579f6
|
Add missing localization for aspect managment
|
2010-10-06 07:56:23 +08:00 |
|
UserAd
|
e7c153df4e
|
Add translation support in profile ('or' between buttons). Fix Russian locale
|
2010-10-06 07:56:23 +08:00 |
|
Stig Johan Berggren
|
ff7c8c7a50
|
Added locale files for Norwegian (bokmål)
Localization files for Norwegian bokmål (nm) inserted. They have been
tested a little locally and do not produce any errors.
|
2010-09-29 17:58:25 +02:00 |
|
Kashif Rasul
|
330cf63599
|
Arabic locale fixes.
|
2010-09-29 17:13:27 +02:00 |
|
Kashif Rasul
|
08ddae0894
|
Added devise Arabic locales and moved locale to correct folder.
|
2010-09-29 16:54:33 +02:00 |
|
Kashif Rasul
|
0fed72d505
|
Added Arabic locales.
|
2010-09-28 13:57:40 +02:00 |
|
ilya
|
a8f05244ba
|
localization should be fixed
|
2010-09-27 16:07:24 -07:00 |
|
ilya
|
50234b095b
|
had to move translation around slightly, now the profile edit will be missing a template
|
2010-09-27 16:02:08 -07:00 |
|
Guillermo
|
1a876355d5
|
Some fixes in spanish locale
|
2010-09-28 03:02:47 +08:00 |
|
Daniele Di Sarli
|
6b9bcfda63
|
Corrected Italian translation
|
2010-09-28 02:41:59 +08:00 |
|
Raphael
|
2f31e036e3
|
Merge branch 'cz' of http://github.com/koo5/diaspora
|
2010-09-27 11:36:04 -07:00 |
|