maxwell
|
f2bdc98b47
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 23:52:46 -07:00 |
|
maxwell
|
e1dd0cf6be
|
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
|
2010-10-13 23:49:13 -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 |
|
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 |
|
maxwell
|
b395208a51
|
DG MS; added more stuff to importer.
|
2010-10-13 16:42:27 -07:00 |
|
ilya
|
3b8998ab71
|
Invitations contains the inviters
|
2010-10-13 13:29:45 -07:00 |
|
ilya
|
bf42b5766c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 11:20:43 -07:00 |
|
Raphael
|
9a1590fa02
|
Move user module requires out to the user modules definition file
|
2010-10-13 11:18:06 -07:00 |
|
ilya
|
db1a01d51b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 18:24:20 -07:00 |
|
ilya
|
324f14c719
|
setting the token to nil on accept of invite
|
2010-10-12 18:23:59 -07:00 |
|
Raphael
|
fe0120cc0d
|
Return everyone on an empty search
|
2010-10-12 18:18:03 -07:00 |
|
ilya
|
d6b08de6fc
|
corrected link on the account page
|
2010-10-11 15:07:17 -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
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
Raphael
|
73e4d2b25b
|
Pull in search improvement, remove cruft
|
2010-10-11 11:08:54 -07:00 |
|
Raphael
|
fe360e386a
|
Merge remote branch 'rmaskey/master' into search
|
2010-10-11 10:47:24 -07:00 |
|
maxwell
|
0541833c18
|
stop the file include madness. using File.join and Rails.root for includes everywhere I could
|
2010-10-10 11:54:08 -07:00 |
|
rmaskey
|
94f20ba684
|
resolution for issue #151 - search with multiple words
|
2010-10-10 08:43:43 -07:00 |
|
ilya
|
8e61b438ab
|
setting the username
|
2010-10-08 16:00:58 -07:00 |
|
Raphael
|
a720694364
|
Make logging less verbose
|
2010-10-08 15:51:12 -07:00 |
|
Raphael
|
b7bf526b91
|
Make logging message clearer
|
2010-10-08 15:47:30 -07:00 |
|
ilya
|
ef3e627bed
|
the users are now made with people
|
2010-10-08 15:40:42 -07:00 |
|
danielvincent
|
154ec95717
|
killed the public tab. made a broadcast button in everyone tab
|
2010-10-08 14:06:49 -07:00 |
|
ilya
|
ddb98502b9
|
setup the controller, still need to make the person
|
2010-10-07 19:25:34 -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
|
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 |
|
ilya
|
3c61365fa1
|
initial invitable in user
|
2010-10-07 18:11:17 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
ilya
|
131e905322
|
fixed the public route
|
2010-10-06 19:05:43 -07:00 |
|
danielvincent
|
66b356b5fe
|
moved public route
|
2010-10-06 18:14:37 -07:00 |
|
danielvincent
|
7c4feb7464
|
better log message
|
2010-10-05 17:34:03 -07:00 |
|
kook
|
85b384010e
|
exchange photos on adding new friend
|
2010-10-05 17:18:51 -07:00 |
|
danielvincent
|
830b3772d5
|
self reference in atom
|
2010-10-05 16:59:55 -07:00 |
|
danielvincent
|
09b861c7a3
|
remove .atom from public url
|
2010-10-05 16:51:27 -07:00 |
|
danielvincent
|
6723a51149
|
correctly indent xml
|
2010-10-05 16:40:50 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
ce4f8cab8b
|
not encrypting the entire thing
|
2010-10-03 17:39:16 -07:00 |
|
ilya
|
304e4ad32b
|
removed the puts
|
2010-10-02 12:37:53 -07:00 |
|
ilya
|
7dcde292e1
|
user posting spec is now green, now stubbing on the apropriate method
|
2010-10-02 12:34:16 -07:00 |
|
ilya
|
b6a912dd02
|
slowly getting specs to pass on with the new api
|
2010-09-30 15:17:53 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
eb7244e07c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:07:01 -07:00 |
|
danielvincent
|
26a4dc76a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 18:34:55 -07:00 |
|
danielvincent
|
df800dc87e
|
ostatus builder
|
2010-09-27 17:58:44 -07:00 |
|
ilya
|
6e407572c4
|
removed unused repost method, going through the warden object
|
2010-09-27 17:27:49 -07:00 |
|
ilya
|
c2b84fd9c6
|
added a public key to post
|
2010-09-27 16:59:54 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|
ilya
|
98bc2df841
|
removed the encryption key= method, and user with private key factory
|
2010-09-27 10:10:54 -07:00 |
|