Raphael
|
8798f05ff7
|
Revert "Revert redis merge to fix bugs on master"
This reverts commit 30698d674b.
|
2010-12-02 15:33:26 -08:00 |
|
Raphael
|
30698d674b
|
Revert redis merge to fix bugs on master
|
2010-12-02 15:20:27 -08:00 |
|
Raphael
|
6cfa6577a5
|
Add first resque job
|
2010-12-02 12:35:26 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
danielvincent
|
b4679c9041
|
Take application_controller before filters out of publicscontroller
|
2010-11-04 15:33:16 -07:00 |
|
danielvincent
|
da8124f8a7
|
hcard has searchable field, and is taken in to account when building Person from webfinger
|
2010-11-02 16:12:43 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
fddec49655
|
adding nexttick
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
Raphael
|
8cf72441b4
|
Make intended behavior on hcard action clearer, return 404 on nonexistent person
|
2010-10-11 10:13:52 -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 |
|
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 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -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
|
eac6b8a63b
|
builder is now a class initialized with a user. added director class.
|
2010-09-27 21:54:01 -07:00 |
|
danielvincent
|
3b8ddf76a3
|
temp route for atom feed. also, public atom currently displays all posts.
|
2010-09-27 18:34:47 -07:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
Raphael
|
16b6fc6cdc
|
Don't give exception on webfinger with no query
|
2010-09-23 17:18:34 -07:00 |
|
maxwell
|
24ca139241
|
MS remove some stray puts
|
2010-09-20 17:11:07 -07:00 |
|
maxwell
|
cb0f0b72eb
|
MS removed a log and trying to be slightly more pedantic
|
2010-09-20 15:32:18 -07:00 |
|
maxwell
|
5e2fdedf8b
|
MS removed another logging of encrypted data....
|
2010-09-20 15:07:30 -07:00 |
|
Michael Fellinger
|
35c9922c61
|
And fix some more requires
|
2010-09-16 15:24:26 +09:00 |
|
Raphael
|
d760725145
|
Don't webfinger another server on receiving a webfinger request
|
2010-09-15 23:01:13 -07:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
4c15b1a01c
|
added license to every single goddamn file. also, put one in the root dir.
|
2010-09-13 14:23:50 -07:00 |
|
Raphael
|
aa1f3c6438
|
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
|
2010-09-10 10:31:23 -07:00 |
|
Raphael
|
86d9a41d25
|
send_friend_request_to now takes a person and group, rather than a receive url and a group id
|
2010-09-09 16:06:42 -07:00 |
|
Raphael
|
3e9a36e1f1
|
Layout false on all publics controller routes
|
2010-09-09 14:15:20 -07:00 |
|
Raphael
|
240dda4eab
|
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
|
2010-09-09 12:21:36 -07:00 |
|
Daniel Grippi & Raphael Sofaer
|
7984756aa7
|
controller cleanup: using respond_to and respond_with.
|
2010-08-29 22:49:13 -07:00 |
|
Raphael
|
9f11a474d8
|
Take out some logging, put in log user on receive
|
2010-08-26 11:46:04 -07:00 |
|
Raphael
|
b7d648e173
|
Validate presence of name on group
|
2010-08-18 11:54:44 -07:00 |
|
Raphael
|
4cd46abaac
|
render nothing at the top
|
2010-08-18 11:48:32 -07:00 |
|
Raphael
|
10aef7a0a3
|
Begin rescue on publics controller to make the post for nonexistent user error more readable
|
2010-08-18 11:46:28 -07:00 |
|
Raphael
|
4c731bf818
|
special-casing local webfinger
|
2010-08-16 11:29:14 -07:00 |
|
Raphael
|
3efa36587a
|
Took out a bunch of user.owner references
|
2010-08-16 11:01:58 -07:00 |
|
Raphael
|
0907d7a9fd
|
RS, DG; Cleaned up the switch in user.receive
|
2010-08-11 16:01:16 -07:00 |
|
Raphael
|
c6a620c7dd
|
RS, DG; store_from_xml is gone, use user.receive
|
2010-08-11 15:05:05 -07:00 |
|
Raphael
|
5228e51262
|
RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated.
|
2010-08-11 14:40:48 -07:00 |
|
ilya
|
11a8b8f3d4
|
MS IZ testing many the friend request user methods
|
2010-08-11 12:28:48 -07:00 |
|
maxwell
|
71612ba33d
|
changing some webfinger resources
|
2010-08-10 12:36:00 -07:00 |
|
maxwell
|
38abd51666
|
MS IZ fixed a couple of failing specs in the parser
|
2010-08-09 21:09:51 -07:00 |
|
maxwell
|
d443be35f9
|
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
|
2010-08-09 17:31:46 -07:00 |
|
maxwell
|
56d7c67bbb
|
Going toward pending requests
|
2010-08-09 17:21:41 -07:00 |
|
Raphael
|
c14bb5a4f8
|
Changed info logging to debug logging almost everywhere
|
2010-08-09 14:39:37 -07:00 |
|
Raphael
|
4350e17656
|
RS, IZ; removed lots of putses, fixed up request, parser, retractions
|
2010-08-06 16:01:39 -07:00 |
|