danielvincent
|
b097f93bf5
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 11:39:17 -07:00 |
|
maxwell
|
5d1fdcaf3a
|
MS fixing bug #67. stripping whitespace from search
|
2010-09-20 11:38:24 -07:00 |
|
danielvincent
|
fe306b37ab
|
DG IZ; mass-assignment quick-fix in controllers
|
2010-09-20 11:30:27 -07:00 |
|
TJ Peden
|
e6c8cf20d3
|
Fixed receive_url problem
|
2010-09-21 01:26:51 +08:00 |
|
maxwell
|
5bf6d358a4
|
MS added small log for when user is found from webfinger
|
2010-09-19 20:40:03 -07:00 |
|
maxwell
|
07d2de6646
|
removed an annoying log of encrypted salmon.
|
2010-09-19 20:36:39 -07:00 |
|
danielvincent
|
08f833ba7a
|
case insensitivity on search
|
2010-09-18 17:21:18 -07:00 |
|
danielvincent
|
e9a3f46fbd
|
fixed query function to go through mongomapper instead of custom
|
2010-09-18 16:42:07 -07:00 |
|
Patrick Aljord
|
182c6228f3
|
show comments ordered by created_at, they are showing up at random order without that
|
2010-09-18 07:36:21 +08:00 |
|
Raphael
|
b3549c79f4
|
Give slightly more specific error message
|
2010-09-17 12:49:49 -07:00 |
|
Raphael
|
ce2260b747
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-17 11:57:36 -07:00 |
|
Raphael
|
99ad001d28
|
Fix websocket spec, take out puts in by_webfinger
|
2010-09-17 09:52:31 -07:00 |
|
Raphael
|
2e8ecceaf7
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 21:53:34 -07:00 |
|
Raphael
|
b45906f902
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 21:35:48 -07:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
maxwell
|
e668071ea5
|
README.md
|
2010-09-16 18:48:18 -07:00 |
|
danielvincent
|
25b4b409be
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-16 16:19:48 -07:00 |
|
danielvincent
|
cbb692b6a3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 16:06:28 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
maxwell
|
2e8785b596
|
applying this change from wiki, thanks astronouth7303
|
2010-09-16 15:04:29 -07:00 |
|
maxwell
|
6f867d60c4
|
MS fixed the nil hostname on user
|
2010-09-16 14:38:24 -07:00 |
|
Raphael
|
1e646fb0a9
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 23:54:57 -07:00 |
|
Raphael
|
32fc6212ab
|
Put only the hostname in diaspora_handle
|
2010-09-15 23:49:55 -07:00 |
|
Raphael
|
d760725145
|
Don't webfinger another server on receiving a webfinger request
|
2010-09-15 23:01:13 -07:00 |
|
Raphael
|
c67a8ea100
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
|
2010-09-15 22:37:05 -07:00 |
|
Stephen Caudill
|
5595dc5f48
|
Retab the project
|
2010-09-16 13:16:10 +08:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
e9009ea609
|
Downcase username only if it is there
|
2010-09-15 18:23:54 -07:00 |
|
Raphael
|
de93fd2818
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 18:10:13 -07:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
04594d7ac5
|
Merge branch 'production' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
|
2010-09-15 17:25:14 -07:00 |
|
Raphael
|
33048fe6db
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
spec/models/aspect_spec.rb
|
2010-09-15 17:24:00 -07:00 |
|
Raphael
|
0e0df7fb22
|
downcase before validation
|
2010-09-15 17:21:23 -07:00 |
|
Raphael
|
bf33313bf9
|
take out index, change backer seed, no puts
|
2010-09-15 17:13:17 -07:00 |
|
Raphael
|
02dda4f0a7
|
change the name of instantiate back
|
2010-09-15 17:08:56 -07:00 |
|
Raphael
|
01d26f6d0e
|
Using custom registrations controller
|
2010-09-15 17:05:21 -07:00 |
|
Raphael
|
e0ffc8bba0
|
First pass at having a custom registrationsController
|
2010-09-15 16:40:03 -07:00 |
|
Daniel Vincent Grippi
|
ee89bfaf8f
|
removed do bad things
|
2010-09-15 16:18:33 -07:00 |
|
maxwell
|
b8bbc58d30
|
save person after changing handle
|
2010-09-15 16:02:23 -07:00 |
|
Daniel Vincent Grippi
|
f0dad8c16a
|
Merge branch 'master' of github.com:diaspora/diaspora into production
|
2010-09-15 15:55:45 -07:00 |
|
maxwell
|
77bd68e7c7
|
MS the deploy config is wrong
|
2010-09-15 15:55:26 -07:00 |
|
Daniel Vincent Grippi
|
e94b48e19a
|
Merge branch 'master' of github.com:diaspora/diaspora into production
Conflicts:
app/models/user.rb
|
2010-09-15 15:55:18 -07:00 |
|
maxwell
|
6e29a66e09
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/models/user.rb
|
2010-09-15 15:46:15 -07:00 |
|
maxwell
|
3a4eb294f8
|
MS made it two callbacks for handles and keys
|
2010-09-15 15:45:26 -07:00 |
|
Daniel Vincent Grippi
|
b2b2748fea
|
seed aspects on user create
|
2010-09-15 15:39:04 -07:00 |
|
Daniel Vincent Grippi
|
82ada7d2d6
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 15:36:59 -07:00 |
|
Daniel Vincent Grippi
|
cd21ee8652
|
just seed family and work
|
2010-09-15 15:36:41 -07:00 |
|
maxwell
|
7741951a42
|
MS removing production stuff from master... yowch
|
2010-09-15 15:26:06 -07:00 |
|
maxwell
|
8828707c45
|
MS fixed the login bug, deploying to master
|
2010-09-15 15:15:15 -07:00 |
|
maxwell
|
c1077b3eed
|
Merge branch 'production' of github.com:diaspora/diaspora into production
|
2010-09-15 14:11:24 -07:00 |
|