maxwell
|
892eec1959
|
MS fixed the websocket bug pushing out all updates to single clients. we should get selenium so we can actually test it :(
|
2010-07-15 09:32:13 -07:00 |
|
Raphael
|
b780ff0610
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-14 12:06:54 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
maxwell
|
9e93fd072e
|
DG MS; added subscriber model for ostatus interop
|
2010-07-13 14:32:27 -07:00 |
|
maxwell
|
0bcbd5b16c
|
DG MS; diaspora xml generate model genereates a valid atom feed for status messages
|
2010-07-13 12:09:06 -07:00 |
|
danielvincent
|
ed8ed9be9e
|
DG MS; started Diaspora::XML for ostatus compliance
|
2010-07-12 20:15:12 -07:00 |
|
Raphael
|
2f265a8483
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-12 18:31:46 -07:00 |
|
maxwell
|
f9f7f0fcc7
|
DG MS; request makes sure http:// and an ending slash is present on a new request link
|
2010-07-12 12:33:31 -07:00 |
|
maxwell
|
5ba2e61ab8
|
MS DG moved xml accessor for profile
|
2010-07-12 11:37:46 -07:00 |
|
maxwell
|
324c085a64
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-12 11:26:29 -07:00 |
|
maxwell
|
18760f13f8
|
push changes
|
2010-07-12 11:25:53 -07:00 |
|
Raphael
|
cdb2aecc6e
|
Speeding up db reset a little
|
2010-07-12 10:47:24 -07:00 |
|
Raphael
|
e420b65591
|
I am bad at syntax
|
2010-07-12 10:42:27 -07:00 |
|
Raphael
|
2c4cad2b4c
|
Forgot a comma
|
2010-07-12 10:37:41 -07:00 |
|
Raphael
|
49c30425c1
|
Added user url to db seed
|
2010-07-12 10:25:56 -07:00 |
|
Raphael
|
c3832cd2a7
|
Reverting gemfile change
|
2010-07-11 13:03:39 -07:00 |
|
maxwell
|
3a785e24fd
|
removed old jquery ajax form thing we never used but made it into the repo
|
2010-07-10 10:42:38 -07:00 |
|
maxwell
|
902a8cb349
|
MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change
|
2010-07-10 10:34:46 -07:00 |
|
maxwell
|
a02a833625
|
updated rails for kicks, run bundle install, and run gem install bundler --pre rspec-rails --pre too
|
2010-07-10 00:32:58 -07:00 |
|
maxwell
|
c073fc6137
|
MS DG friend deletions dont work, but they do send, prob a parser problem
|
2010-07-09 19:36:02 -07:00 |
|
maxwell
|
d37461a432
|
ms dg post deletions now come thru the socket again
|
2010-07-09 19:27:39 -07:00 |
|
danielvincent
|
ce132dd782
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 18:54:59 -07:00 |
|
danielvincent
|
7bfdaac691
|
added unfriend button to person show page
|
2010-07-09 18:54:48 -07:00 |
|
maxwell
|
601da95c8c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 18:54:05 -07:00 |
|
maxwell
|
29516d829e
|
MS flash now gives message if you have already friended a given person
|
2010-07-09 18:53:47 -07:00 |
|
danielvincent
|
aa916d0604
|
moved User.first out of the application view
|
2010-07-09 18:50:39 -07:00 |
|
maxwell
|
23057869e1
|
DG MS debugging friend request
|
2010-07-09 18:41:39 -07:00 |
|
maxwell
|
8147602570
|
DG MS friends now are delete
|
2010-07-09 18:10:11 -07:00 |
|
maxwell
|
ed412e12b0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 16:08:07 -07:00 |
|
maxwell
|
f5fd0b011a
|
DG MS; upon friend deletion, all connected posts and comments are purged
|
2010-07-09 16:08:00 -07:00 |
|
ilya
|
929adca383
|
calling after create hook direcly in tests
|
2010-07-09 17:42:32 -04:00 |
|
maxwell
|
cf352b6f8d
|
DG MS; cannot friend request an existing friend.
|
2010-07-09 14:35:42 -07:00 |
|
maxwell
|
b052ddeb84
|
DG MS; database seed scripts now ensure all friends are set to true
|
2010-07-09 14:13:39 -07:00 |
|
maxwell
|
48adc9ebc1
|
DG MS; person object now properly stored with request object save
|
2010-07-09 14:07:35 -07:00 |
|
maxwell
|
d21a3baf32
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-09 11:14:11 -07:00 |
|
maxwell
|
b49f198c4f
|
DG MS cleaned up some of the request stuff
|
2010-07-09 11:14:00 -07:00 |
|
ilya
|
228d8820c8
|
checking in test keyring
|
2010-07-09 14:09:42 -04:00 |
|
ilya
|
cfaf13ac7d
|
Use pregenerated keys
|
2010-07-09 13:45:00 -04:00 |
|
ilya
|
eb9c6814d6
|
screen in tools, keyring clearing disabled
|
2010-07-09 13:36:24 -04:00 |
|
maxwell
|
275e0baa0c
|
MS DG fixed deploy script so tom has correct URL
|
2010-07-09 10:27:18 -07:00 |
|
maxwell
|
c7e1bc3a46
|
DG MS debugging friend requests
|
2010-07-09 10:18:29 -07:00 |
|
maxwell
|
874ea58678
|
new rake spec for dev database (different default user than tom, friends
with all other boxes)
|
2010-07-09 09:59:48 -07:00 |
|
maxwell
|
c2c64d9938
|
MS DG more friend request tests pass
|
2010-07-08 23:14:54 -07:00 |
|
ilya
|
2142ad2776
|
People -> Person in rake backer
|
2010-07-09 01:03:46 -04:00 |
|
maxwell
|
408b58cbbf
|
Merge branch 'safe-without-gpg'
|
2010-07-08 21:45:27 -07:00 |
|
maxwell
|
6cc9deaa65
|
merging with head
|
2010-07-08 21:44:14 -07:00 |
|
maxwell
|
583d3d0c82
|
DG MS friending now tests out
|
2010-07-08 21:34:38 -07:00 |
|
ilya
|
cdd6e2034e
|
Updated deploy scripts
|
2010-07-09 00:23:37 -04:00 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
ilya
|
caa92ea3a0
|
commented ci out of deploy
|
2010-07-08 21:30:19 -04:00 |
|