maxwell
|
41b918e6e2
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 10:25:37 -07:00 |
|
maxwell
|
45fb44ef36
|
MS IZ added trailing slash for the hub notification
|
2010-07-16 10:25:24 -07:00 |
|
Raphael
|
4178a78b23
|
Logger in receive friend request
|
2010-07-16 10:18:45 -07:00 |
|
Raphael
|
89cf2db10e
|
fixing db seed
|
2010-07-15 15:47:27 -07:00 |
|
Raphael
|
d7e07dfda8
|
comment specs fixed, comments now signed by post poster
|
2010-07-15 14:41:39 -07:00 |
|
Raphael
|
64c81f0551
|
merge in master, only friend tom
|
2010-07-15 14:18:22 -07:00 |
|
Raphael
|
50addb8309
|
Took password out of db:seed:backer
|
2010-07-15 13:53:43 -07:00 |
|
Raphael
|
2d5d3a2f2d
|
commit more often
|
2010-07-15 13:29:21 -07:00 |
|
Raphael
|
4bd50d47b7
|
DB seeds now use friending, presidents are not friends.
|
2010-07-14 12:41:22 -07:00 |
|
Raphael
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -07:00 |
|
Raphael
|
0f7006dfea
|
Profiles do not need to be deleted
|
2010-07-14 11:32:33 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -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 |
|
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
|
8147602570
|
DG MS friends now are delete
|
2010-07-09 18:10:11 -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
|
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 |
|
maxwell
|
e1834cc887
|
DG MS fixed spec
|
2010-07-08 20:51:12 -07:00 |
|
maxwell
|
06eec9204a
|
DG MS; person request is now request. refactoring as well. user verbiage for request actions
|
2010-07-08 18:28:39 -07:00 |
|
ilya
|
122bbf0cd2
|
Merging dashboards
|
2010-07-08 20:56:25 -04:00 |
|
ilya
|
a5db2cd231
|
Added keyrings to gitignore, symlinked to shared dir in cap scripts
|
2010-07-08 20:54:20 -04:00 |
|
maxwell
|
1fa2dfd6eb
|
DG MS cleaning up friend request
|
2010-07-08 12:05:06 -07:00 |
|
maxwell
|
da4e148fed
|
DG MS; fixing friend request
|
2010-07-08 11:44:18 -07:00 |
|
maxwell
|
11d4a9e2c7
|
rolled back some message handler nonsense
|
2010-07-08 11:16:38 -07:00 |
|
ilya
|
6e6763de14
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 13:28:17 -04:00 |
|
ilya
|
93c5404cab
|
DG IZ message handler is a singleton'
|
2010-07-08 13:28:02 -04:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
58ed75a289
|
MS socket now works in the server, but I can't figure out how to mock this stuff
|
2010-07-07 22:20:15 -07:00 |
|
danielvincent
|
ebfc55ff28
|
DG IZ friend request, has a puts in the receive hook for debugging
|
2010-07-07 21:20:38 -07:00 |
|
danielvincent
|
b496ee567a
|
DG IZ; person request now appends url to pass validations when saved from inbound XML
|
2010-07-07 20:24:50 -07:00 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
danielvincent
|
a33acd134e
|
DG IZ; fixed person requesting (friend requests).
|
2010-07-07 18:10:47 -07:00 |
|
danielvincent
|
3d105e7c1e
|
DG IZ; removed Friend model, now Person is used instead. Also, broke the websocket.
|
2010-07-07 16:53:52 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
ilya
|
79c0e960ad
|
DG IZ; friend now has an active flag
|
2010-07-06 23:43:01 -04:00 |
|
ilya
|
d5d4d4ae84
|
DG IZ; friend requests get saved locally, friend object gets transmitted and saved remotely
|
2010-07-06 21:29:49 -04:00 |
|
ilya
|
a23a2691f3
|
DG IZ; starting fresh with requests
|
2010-07-06 20:09:20 -04:00 |
|
ilya
|
14e5b23eb5
|
trying deploying
|
2010-07-06 19:32:44 -04:00 |
|
ilya
|
1a44cf5ab3
|
DG IZ push to wrapped to check before sending off a friend req
|
2010-07-06 15:11:24 -04:00 |
|
ilya
|
e7ac8bec32
|
rake task reset kills all friend requests
|
2010-07-06 14:57:21 -04:00 |
|
ilya
|
0587688d18
|
DG IZ; friend requests pass through the webhook, need to refactor the parser because now the XML does not make sense, no big deal. P.S. WTF is send_to_seed in message_handler
|
2010-07-06 02:15:49 -04:00 |
|
danielvincent
|
df3fe6c2a9
|
DG IZ RS; deletion now gets sent through the websocket
|
2010-07-02 15:16:28 -07:00 |
|
danielvincent
|
469599a4a9
|
DG RS IZ; added post deletion propagation
|
2010-07-02 13:08:53 -07:00 |
|
Raphael
|
de0bff17dd
|
Removed headers
|
2010-07-02 11:11:59 -07:00 |
|
Raphael
|
76eabef2c1
|
commenting out sender parsing
|
2010-07-02 10:53:34 -07:00 |
|
maxwell
|
8e94fc5b4f
|
added mean message
|
2010-07-01 17:05:14 -07:00 |
|
maxwell
|
ba984009f8
|
added chrome frame
|
2010-07-01 16:38:32 -07:00 |
|
Raphael
|
63b3d0186a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 21:19:32 -07:00 |
|
danielvincent
|
f759f5d1b7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 18:04:14 -07:00 |
|
danielvincent
|
12bbdb38a7
|
DG IZ deploying with correct names
|
2010-06-30 18:03:25 -07:00 |
|
maxwell
|
9631977597
|
RS MS comments propagate, and show up IN REAL TIME
|
2010-06-30 17:29:32 -07:00 |
|
Raphael
|
877f321d51
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:26:25 -07:00 |
|
maxwell
|
40697167da
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:24:57 -07:00 |
|
maxwell
|
e696ef7023
|
comments now go go go and are tested RS MS
|
2010-06-30 16:24:44 -07:00 |
|
danielvincent
|
65321ed096
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-30 16:00:40 -07:00 |
|
danielvincent
|
fbd1195113
|
DG IZ; rake task for backer, can now pass in arguments [backer_num, password]
|
2010-06-30 16:00:29 -07:00 |
|
Raphael
|
5f927abffe
|
RS, slight clarification in common
|
2010-06-30 15:27:35 -07:00 |
|
Raphael
|
aa083735fa
|
Moved url mapping to push_to
|
2010-06-30 15:18:42 -07:00 |
|
maxwell
|
940b967bbb
|
fuck
|
2010-06-30 14:29:52 -07:00 |
|
maxwell
|
4077e4248e
|
pushing for cap deploy
|
2010-06-30 14:23:40 -07:00 |
|
maxwell
|
fcdba64828
|
pushing to test comment passing
|
2010-06-30 13:54:09 -07:00 |
|
danielvincent
|
585906d3d4
|
DG IZ; db rake tasks ouput text; delete is now purge
|
2010-06-30 13:47:26 -07:00 |
|
danielvincent
|
6d84eb2b6f
|
DG IZ; added rake db:reset, which aliases a delete and seed to the db
|
2010-06-30 13:36:15 -07:00 |
|
danielvincent
|
bb97aa9202
|
DG IZ; rake db:seed, rake db:delete
|
2010-06-30 11:57:11 -07:00 |
|
maxwell
|
638b71ae28
|
Added a spec to person, cleaned up some putses
|
2010-06-29 17:45:13 -07:00 |
|
maxwell
|
1b2745e788
|
added socket renderer spec and slight refactor
|
2010-06-29 11:50:15 -07:00 |
|
maxwell
|
f4a8671854
|
fixed the remote socket updating bug? we will see
|
2010-06-28 16:15:30 -07:00 |
|
maxwell
|
d9a6bb7ba2
|
merged my socket changes
|
2010-06-28 14:52:43 -07:00 |
|
maxwell
|
5cf2e3c3ea
|
commiting so i can pull
|
2010-06-28 14:47:23 -07:00 |
|
ilya
|
25198a7e86
|
IZ, RS; Moved XML parser to lib
|
2010-06-28 15:56:46 -04:00 |
|
Maxwell Salzberg
|
2bbfcb0bb1
|
putting debug in for master so I can check deployed servers out
|
2010-06-26 14:16:19 -07:00 |
|
maxwell
|
c99416ca67
|
fixed a broken common.rb spec
|
2010-06-25 23:08:59 -07:00 |
|
ilya
|
ad28f0cf82
|
RS, IZ; Maybe commited
|
2010-06-26 00:58:24 -04:00 |
|
maxwell
|
5cade230ac
|
added silly debug toggle
|
2010-06-25 15:33:23 -07:00 |
|
ilya
|
179af4fbfa
|
Merged mongomapper and master
|
2010-06-25 00:11:45 -04:00 |
|
maxwell
|
5f3a6a7aa0
|
MS mongomapper works kinda
|
2010-06-24 17:22:49 -07:00 |
|
ilya
|
8829714e2d
|
RS, IZ, Cleaned up Post, finished Person refactor, FactoryGirl sequences are unpleasant
|
2010-06-23 20:17:44 -04:00 |
|
Maxwell Salzberg
|
e6e1c22b07
|
DG; webhooks apply incoming posts to current friends with a silent fail on no match
|
2010-06-23 01:20:56 -07:00 |
|
maxwell
|
1fcd758bd4
|
removed the mutex, added rack fiber pool. this thing screams
|
2010-06-19 15:07:12 -07:00 |
|
maxwell
|
2f6a11f018
|
fixed the stupid addressable bug, also started playing with 1.9.2...sorry for the spaced out commit
|
2010-06-19 14:42:23 -07:00 |
|
maxwell
|
5286b6be69
|
DG MS; require XML root node; added header to XML (not yet required)
|
2010-06-18 18:03:13 -07:00 |
|
maxwell
|
c430aaff18
|
DG MS; added database_cleaner for spec runner. touched up common specs for webhooks; depirated old status message to xml
|
2010-06-18 14:35:51 -07:00 |
|
maxwell
|
d4bf2f539d
|
DG MS; removed signup link and route
|
2010-06-18 10:48:37 -07:00 |
|
maxwell
|
81016729c4
|
fixing dans commit
|
2010-06-17 20:35:16 -07:00 |
|
maxwell
|
855fc62e01
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-06-17 20:34:45 -07:00 |
|
maxwell
|
e7835955eb
|
fixed a bug
|
2010-06-17 20:33:59 -07:00 |
|
danielvincent
|
cbdb3ecbc7
|
quick fix with notify_friends. sets xml variable in post request.
|
2010-06-17 20:32:44 -07:00 |
|
danielvincent
|
1ce01be534
|
DG MS; fixed infinate loop
|
2010-06-17 20:06:44 -07:00 |
|
danielvincent
|
39118293eb
|
DG MS; fixed minor webhook bug when generating xml collection.
|
2010-06-17 18:45:50 -07:00 |
|
danielvincent
|
02137b9fb9
|
DG MS; receive hook working.
|
2010-06-17 18:29:56 -07:00 |
|
danielvincent
|
ba6d136bc7
|
DG MS; added specs for common module
|
2010-06-17 15:22:02 -07:00 |
|
danielvincent
|
628af0372f
|
DG MS; completed event-queue intergration.
|
2010-06-17 14:29:41 -07:00 |
|
danielvincent
|
3371b87fff
|
DG MS; queue works. just need to move some tests over.
|
2010-06-17 11:32:13 -07:00 |
|
danielvincent
|
4cecb522b6
|
DG MS; queue still working. half-way finished cleaning up code.
|
2010-06-17 10:36:54 -07:00 |
|
danielvincent
|
d91cec0881
|
queue works. needs cleanup.
|
2010-06-17 10:29:30 -07:00 |
|
Maxwell Salzberg
|
67535c1113
|
tried to git rid of error in em-http-request
|
2010-06-17 09:20:59 -07:00 |
|
danielvincent
|
43207aeb41
|
pending: resolving post action in queue
|
2010-06-16 23:12:23 -07:00 |
|
Raphael Sofaer
|
ed26c82be4
|
RS, IZ; merged day's commits
|
2010-06-15 21:41:39 -07:00 |
|
Raphael Sofaer
|
8213443afd
|
RS, IZ; stubbed out and wrapped curl backtick
|
2010-06-15 21:34:52 -07:00 |
|
maxwell
|
497b477e89
|
DG MS added a post model, going to put it more places than just status message now
|
2010-06-15 17:21:57 -07:00 |
|
maxwell
|
e068707158
|
added nifty templates, and started a user model. session model is next
|
2010-06-12 15:26:37 -07:00 |
|
Raphael Sofaer
|
0390bbde8a
|
Activerecord this time\!
|
2010-06-11 10:40:49 -07:00 |
|