maxwell
c4ff07b09a
twitter oauth dance complete
2010-10-25 17:41:58 -07:00
ilya
b337d5acc9
delivery method test in tests
2010-10-22 16:36:54 -07:00
ilya
47b03c45b2
commented out the email interceptor
2010-10-22 10:37:04 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07: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
6fa82490c9
remove friend from aspect box, with js call to remove the person from the aspect
2010-10-20 17:34:52 -07:00
ilya
94a7a3c6ad
IZ MS; deleted move_friends removed
2010-10-20 14:26:45 -07:00
Alec Leamas
03f637eca9
Polishing up after git mess...
2010-10-20 22:05:42 +02:00
Joseph Method
4b588ccefb
Addresses [ #380 ] and [ #239 ] by handling the errors from bad identities
2010-10-19 23:44:43 -04:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07: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
Alec Leamas
fcd70ce152
Add a configuration file
...
Adds a config file with environment and default thin
options
2010-10-19 08:26:43 +02: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
maxwell
341009e20f
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
...
Conflicts:
Gemfile
Gemfile.lock
spec/models/user/invite_spec.rb
2010-10-14 23:02:06 -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
maxwell
e218ab6780
Merge branch 'master' of github.com:diaspora/diaspora into import
...
Conflicts:
app/controllers/users_controller.rb
2010-10-13 23:09:48 -07:00
maxwell
04f6cdaacf
MS DG; basic view support; it works, but it is ugly
2010-10-13 18:42:24 -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
Alec Leamas
0c30f544d9
Fallback to static version data if git unavailable.
...
Uses the file config/gitversion if git is unavailable. This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
2010-10-10 16:38:01 +02:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
Nick van der Burgt
09b38bb726
Added dutch locale
2010-10-08 09:11:04 +02:00
ilya
9a34ca07c4
Merge branch 'master' of github.com:diaspora/diaspora into invites
2010-10-07 19:25:42 -07:00
ilya
ddb98502b9
setup the controller, still need to make the person
2010-10-07 19:25:34 -07:00
danielvincent
75aadc5c57
DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit.
2010-10-07 18:25:59 -07: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
danielvincent
c756e1a331
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 18:17:38 -07:00
danielvincent
2e73104d6f
DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2
2010-10-07 18:17:26 -07:00
Raphael
399e437655
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 17:34:03 -07:00
