maxwell
|
c3d0c78bd1
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
lib/diaspora/user/receiving.rb
|
2010-11-02 12:46:08 -07:00 |
|
maxwell
|
19bbf8ce4d
|
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
|
2010-11-02 12:38:30 -07:00 |
|
danielvincent
|
a3ce5f1cd7
|
REMOVED IMPORTER
|
2010-11-02 11:17:47 -07:00 |
|
Raphael
|
c031416ca8
|
Merge branch 'master' into HEAD
Conflicts:
lib/diaspora/user/receiving.rb
pkg/ubuntu/dist
|
2010-11-02 10:54:37 -07:00 |
|
maxwell
|
9e1c6174bf
|
IZ MS remove two unused methods from diaspora_parser
|
2010-11-02 10:06:41 -07:00 |
|
maxwell
|
15d6cff837
|
MS IZ everything now uses diaspora handle. this feels so good
|
2010-11-01 18:42:42 -07:00 |
|
maxwell
|
3c8b40c427
|
IZ MS retractions now use diaspora handle
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
06445901f8
|
IZ MS retrations for posts now green
|
2010-11-01 17:11:06 -07:00 |
|
maxwell
|
3aab691c78
|
updating requests for me now that person is taken out of requests
|
2010-11-01 14:54:40 -07:00 |
|
maxwell
|
922aa85fb7
|
MS IZ refactor green
|
2010-11-01 14:54:40 -07:00 |
|
danielvincent
|
f6b4be97a3
|
requests are almost there
|
2010-11-01 14:54:40 -07:00 |
|
zhitomirskiyi
|
71ebc90714
|
Merge branch 'secure-command-exec' of http://github.com/himanshuc/diaspora into himanshuc-secure-command-exec
|
2010-10-31 22:53:10 -07:00 |
|
Derrick Camerino
|
b19cdf2e25
|
fixing N socketing bug
|
2010-10-31 03:15:58 -07:00 |
|
Sarah Mei
|
07c216f31b
|
Putting the jasmine back in CI - changing selenium to be an external process.
|
2010-10-30 16:31:36 -07:00 |
|
Sarah Mei
|
2268cd204c
|
Taking jasmine out of CI for now - selenium server isn't reliably starting up during jasmine:ci
|
2010-10-30 13:52:52 -07:00 |
|
Sarah Mei
|
08a70e4980
|
Moved default rake task to default.rake. Now runs cucumber, rspec, and jasmine.
|
2010-10-30 11:51:54 -07:00 |
|
Sarah Mei
|
d819c98718
|
can haz working jasmine
|
2010-10-29 22:21:08 -07:00 |
|
Himanshu Chhetri
|
4db521657d
|
Use FileUtils for all file operations. Also uses Kernel.system to execute shell commands in a secure fashion.
|
2010-10-29 20:31:45 -07:00 |
|
danielvincent
|
5a9bfa7405
|
DG IZ; post senders are now verified by diaspora handles
|
2010-10-29 16:49:59 -07:00 |
|
maxwell
|
15bd24a64f
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
spec/lib/message_handler_spec.rb
spec/spec_helper.rb
|
2010-10-29 16:23:33 -07:00 |
|
maxwell
|
c1c045a4cd
|
mocking
|
2010-10-29 16:21:39 -07:00 |
|
Raphael
|
5b78a31d29
|
make_user now makes a user from fixtures
|
2010-10-29 15:53:21 -07:00 |
|
maxwell
|
7e7c4c3431
|
refactored message handler spec
|
2010-10-29 14:26:11 -07:00 |
|
maxwell
|
f75bd6bc2e
|
whoops, taking out queue stuff untill i finish
|
2010-10-29 13:05:35 -07:00 |
|
maxwell
|
c6fbcd28f7
|
stubbing out the hub publish method
|
2010-10-29 12:09:10 -07:00 |
|
maxwell
|
a5eb4bf1a7
|
Merge branch 'emw-merge'
|
2010-10-29 11:38:47 -07:00 |
|
maxwell
|
39f66cc5d9
|
tests are green
|
2010-10-29 11:19:07 -07:00 |
|
maxwell
|
7c32649df4
|
rebasing master
|
2010-10-29 11:18:20 -07:00 |
|
maxwell
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
b8a9025616
|
bad merge in receive
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
a5ba14f89c
|
nope that last fix I was too tired. the problem is when someone sends me a request saying it is a response from me
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
09c4def70b
|
bug; when someone sends you an unknown request, your server crashes.
|
2010-10-29 11:16:11 -07:00 |
|
maxwell
|
9f314f44d9
|
typo
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
d1de921d46
|
longer timeout
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
483960ae98
|
MS IZ more begin rescue
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
68a44af856
|
making a few more cleanup and tests
|
2010-10-29 11:13:08 -07:00 |
|
maxwell
|
eddcb71fcb
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:11:05 -07:00 |
|
maxwell
|
9a2e3ef158
|
making a few more cleanup and tests
|
2010-10-29 11:05:17 -07:00 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
Derrick Camerino
|
5d0700001e
|
changing shell command to use FileUtils
|
2010-10-28 20:46:45 -07:00 |
|
zhitomirskiyi
|
f484eb957f
|
comments now don't imbed the person in the xml
|
2010-10-28 12:13:39 -07:00 |
|
zhitomirskiyi
|
21c75c08bb
|
removed the http inspect
|
2010-10-26 19:19:34 -07:00 |
|
zhitomirskiyi
|
708927cc6d
|
more debugging on remote, back to 5 sec timeout
|
2010-10-26 18:31:06 -07:00 |
|
zhitomirskiyi
|
d61ec0186f
|
debugging, trying increasing the timeout
|
2010-10-26 18:21:47 -07:00 |
|
zhitomirskiyi
|
8b16dd25e7
|
trying better logging
|
2010-10-26 18:16:10 -07:00 |
|
zhitomirskiyi
|
0b2e00b7d6
|
MS IZ the mailer will not be setup unless turned on in the APP_CONFIG
|
2010-10-26 17:46:19 -07:00 |
|
zhitomirskiyi
|
fa484e95e4
|
MS IZ refactored querying
|
2010-10-26 17:05:38 -07:00 |
|
zhitomirskiyi
|
acdbbe4dfc
|
no mail for debugging for now
|
2010-10-26 15:34:02 -07:00 |
|
zhitomirskiyi
|
c0c8c6253c
|
added a logging line for debugging
|
2010-10-26 15:13:16 -07:00 |
|