maxwell
|
3cee09407c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-21 15:47:46 -07:00 |
|
maxwell
|
6f7f82e818
|
added helpers for photo show page
|
2010-07-21 15:47:30 -07:00 |
|
Raphael
|
9b4d92e1fa
|
trying to patch relationship controller
|
2010-07-21 15:36:14 -07:00 |
|
maxwell
|
a5f359ef1b
|
MS DG added a safe for viewing photosize
|
2010-07-21 15:08:00 -07:00 |
|
maxwell
|
0f407b11ed
|
MS DG comments now work on photo show page; full size photos now available
|
2010-07-21 14:58:06 -07:00 |
|
maxwell
|
6410b68ea4
|
added correct path to ignore for uploads
|
2010-07-21 14:31:08 -07:00 |
|
maxwell
|
695a93ddad
|
DG MS added basic album traversal
|
2010-07-21 14:29:58 -07:00 |
|
danielvincent
|
d5c28eb9a6
|
album photos as links were too janky; removed
|
2010-07-21 00:42:41 -07:00 |
|
danielvincent
|
5fc2dfa0bb
|
delete links removed from album index
|
2010-07-21 00:40:57 -07:00 |
|
danielvincent
|
aece0fc1c7
|
removed duplications used for testing
|
2010-07-21 00:32:38 -07:00 |
|
danielvincent
|
c01e9846cf
|
began album index page. added a larger thumbnail on image upload. also, there is one HUGE memory leak somewhere
|
2010-07-21 00:24:11 -07:00 |
|
maxwell
|
301343ae01
|
DG MS added basic album support
|
2010-07-20 21:28:24 -07:00 |
|
maxwell
|
f07740454a
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 19:30:28 -07:00 |
|
danielvincent
|
249948a500
|
hotfix for photos/collection relationship to fix photo saving
|
2010-07-20 19:29:19 -07:00 |
|
maxwell
|
dac3c7a8de
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 16:22:08 -07:00 |
|
maxwell
|
933bf61db8
|
RS, MS, relationship_flow returns the action and the url to execute it to
|
2010-07-20 16:15:36 -07:00 |
|
danielvincent
|
51fd87db36
|
no ideas why collection saving isn't working...
|
2010-07-20 15:15:11 -07:00 |
|
ilya
|
1bd2c16ef1
|
DG IZ started the collection spec
|
2010-07-20 14:01:56 -07:00 |
|
Raphael
|
afc150c719
|
Reverting reverrsion
|
2010-07-20 11:56:11 -07:00 |
|
Raphael
|
382caf7adc
|
Reverting last commit
|
2010-07-20 11:53:13 -07:00 |
|
Raphael
|
7b6289c78a
|
Took label out of publisher for photo
|
2010-07-20 11:52:38 -07:00 |
|
ilya
|
715a6ae770
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:50:45 -07:00 |
|
ilya
|
7901791ee3
|
DG IZ; added simple image picker for edit profile page. currently displays all images uploaded.
|
2010-07-20 11:50:36 -07:00 |
|
maxwell
|
453d2ee827
|
RS MS fail. totally made a new bug and fixed it re: resizing
|
2010-07-20 11:50:23 -07:00 |
|
maxwell
|
d420652311
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:41:56 -07:00 |
|
maxwell
|
e856945a94
|
RS MS photos are no longer ginormous, and also a small bug where photos were going to the status message show page.
|
2010-07-20 11:41:50 -07:00 |
|
Raphael
|
8e8c48eac9
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-20 11:31:51 -07:00 |
|
Raphael
|
d8cbbcf6c8
|
Added photo file validation spec
|
2010-07-20 11:31:41 -07:00 |
|
Raphael
|
de3a08d031
|
Took out putses
|
2010-07-20 10:23:19 -07:00 |
|
ilya
|
e08ed8805f
|
DG IZ photo upload form now with all the others
|
2010-07-20 10:00:02 -07:00 |
|
danielvincent
|
55710ffbdb
|
image uploader does two thumbnails
|
2010-07-17 21:10:21 -07:00 |
|
maxwell
|
ec3f6e6765
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-17 19:22:26 -07:00 |
|
danielvincent
|
c53efbe56f
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
app/models/post.rb
|
2010-07-17 19:00:53 -07:00 |
|
Raphael
|
bb21361a6b
|
Photo controller fixed
|
2010-07-17 18:13:51 -07:00 |
|
maxwell
|
917d58acbb
|
MS found one more duplicate in the Gemfile
|
2010-07-17 14:10:31 -07:00 |
|
Raphael
|
7d7c39e3dc
|
callbacks not running on photo save
|
2010-07-17 14:09:21 -07:00 |
|
danielvincent
|
c8c76ddab5
|
added auth_user back to photos controller
|
2010-07-17 14:08:18 -07:00 |
|
danielvincent
|
79536dcfb7
|
all post partials now use object_path for links
|
2010-07-17 13:59:04 -07:00 |
|
danielvincent
|
b221e19746
|
every post partial shows a user picture. a post's comments are displayed with a count in its show page
|
2010-07-17 13:41:54 -07:00 |
|
Raphael
|
93e900b998
|
fixed comments, did I break request url?
|
2010-07-17 11:29:30 -07:00 |
|
Raphael
|
d8ad4367d5
|
Tests now pass
|
2010-07-17 09:32:41 -07:00 |
|
maxwell
|
eb4153ec8f
|
did a couple of things to the request page
|
2010-07-16 23:22:18 -07:00 |
|
maxwell
|
5d0c5dbd86
|
MS kinda hacky webfinger email fix
|
2010-07-16 23:03:59 -07:00 |
|
danielvincent
|
180138610c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 23:02:31 -07:00 |
|
danielvincent
|
04eb66b2e6
|
user has a image url field for user picture
|
2010-07-16 23:02:24 -07:00 |
|
maxwell
|
44b4defb69
|
MS IZ YEAAAAAAAAAAAAHHHHHgit push origin master git push origin master
|
2010-07-16 22:20:25 -07:00 |
|
maxwell
|
cd31d11aca
|
MS IZ adding a friend through the webfinger profile
|
2010-07-16 22:11:55 -07:00 |
|
maxwell
|
f34e033bce
|
MS IZ getting the profile
|
2010-07-16 21:59:40 -07:00 |
|
maxwell
|
58b052b07f
|
IZ MS small bugfix
|
2010-07-16 21:35:16 -07:00 |
|
maxwell
|
a742ef1253
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
Conflicts:
Gemfile
|
2010-07-16 21:33:57 -07:00 |
|
maxwell
|
36c911d20b
|
IZ MS added diaspora rel to webfinger profile
|
2010-07-16 21:33:08 -07:00 |
|
danielvincent
|
5637ab2a8e
|
added multipart option to new photo form. needed to remove remote true for now.
|
2010-07-16 21:14:42 -07:00 |
|
Raphael
|
93fdbae9c5
|
fixed small bug on user show page, added header text to user edit page
|
2010-07-16 17:27:57 -07:00 |
|
Raphael
|
bb4d5cad59
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 17:26:22 -07:00 |
|
Raphael
|
fa46fb31f4
|
Added photos, profile editing
|
2010-07-16 17:26:06 -07:00 |
|
maxwell
|
c124a9ab41
|
IZ MS blogs ctivity streams/atom
|
2010-07-16 16:07:58 -07:00 |
|
maxwell
|
06238703c3
|
IZ MS bookmarks now create activity streams
|
2010-07-16 15:54:26 -07:00 |
|
maxwell
|
98bc754627
|
trying to get it reporting from diaspora
|
2010-07-16 14:54:14 -07:00 |
|
maxwell
|
86718dbec3
|
trying to get it reporting from diaspora
|
2010-07-16 14:53:07 -07:00 |
|
maxwell
|
642db5006f
|
trying to get it reporting from diaspora
|
2010-07-16 14:49:44 -07:00 |
|
maxwell
|
03a8f2ea5c
|
trying to get it reporting from diaspora
|
2010-07-16 14:36:50 -07:00 |
|
maxwell
|
3d87c111df
|
webfinger is now not washington specific
|
2010-07-16 14:15:19 -07:00 |
|
Raphael
|
9165ac413a
|
image uploading started
|
2010-07-16 12:31:24 -07:00 |
|
maxwell
|
7e190047ec
|
IZ MS host
|
2010-07-16 11:14:26 -07:00 |
|
maxwell
|
4259dc7dfe
|
IZ MS changing end slash
|
2010-07-16 11:10:38 -07:00 |
|
maxwell
|
172141db0a
|
IZ MS setting alias to not idendica
|
2010-07-16 11:07:17 -07:00 |
|
maxwell
|
b39f7cebd0
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 10:39:18 -07:00 |
|
maxwell
|
081a6a2c73
|
MS IZ trying to delete commented stuff
|
2010-07-16 10:39:02 -07:00 |
|
Raphael
|
256757f02a
|
Rails.logger in a model
|
2010-07-16 10:29:42 -07:00 |
|
Raphael
|
9f90ae4db0
|
Syntax errors are awesome
|
2010-07-16 10:20:41 -07:00 |
|
Raphael
|
4178a78b23
|
Logger in receive friend request
|
2010-07-16 10:18:45 -07:00 |
|
Raphael
|
567d3f4dc5
|
Fixing friending deploy
|
2010-07-16 10:06:29 -07:00 |
|
Raphael
|
7dd8acadf7
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-16 09:59:24 -07:00 |
|
Raphael
|
05e6dada58
|
Fixing deploy friending
|
2010-07-16 09:59:06 -07:00 |
|
maxwell
|
bf3d34090e
|
MS IZ = AHHH
|
2010-07-15 19:08:25 -07:00 |
|
maxwell
|
9ff4cd015d
|
MS IZ = AHHH
|
2010-07-15 19:05:59 -07:00 |
|
maxwell
|
f927ace140
|
MS IZ = AHHH
|
2010-07-15 19:01:14 -07:00 |
|
maxwell
|
8f59a9d788
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:42:44 -07:00 |
|
maxwell
|
b903163d3f
|
MS IZ = AHHH
|
2010-07-15 18:42:25 -07:00 |
|
Raphael
|
cae5700222
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 18:41:01 -07:00 |
|
Raphael
|
501620e9fb
|
DG RS; fixed some visual bugs. request link now turns red on new request
|
2010-07-15 18:40:55 -07:00 |
|
maxwell
|
65deaba558
|
MS IZ hcard, emptyfiles, routesw
|
2010-07-15 18:36:07 -07:00 |
|
maxwell
|
45abeb2346
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:11:20 -07:00 |
|
maxwell
|
6bab2fedc8
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:06:48 -07:00 |
|
maxwell
|
2dc6b5f46a
|
MS IZ small webfinger bug fixes
|
2010-07-15 17:02:36 -07:00 |
|
maxwell
|
9119d8af93
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:59:22 -07:00 |
|
maxwell
|
5dea277294
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:56:54 -07:00 |
|
maxwell
|
d393458ae8
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-15 16:55:09 -07:00 |
|
maxwell
|
cc712196a6
|
MS IZ small webfinger bug fixes
|
2010-07-15 16:54:46 -07:00 |
|
Raphael
|
7fb7c519cc
|
Adding active to friend view
|
2010-07-15 16:30:56 -07:00 |
|
Raphael
|
e5a5b5a828
|
Fixing zombies
|
2010-07-15 16:20:38 -07:00 |
|
Raphael
|
613e2da3e6
|
Made logging clearer, fixing zombiefriends
|
2010-07-15 16:11:19 -07:00 |
|
Raphael
|
82e3f6a14e
|
debugging zombiefriends
|
2010-07-15 16:06:10 -07:00 |
|
Raphael
|
417df7f874
|
debugging zombiefriends
|
2010-07-15 16:03:48 -07:00 |
|
Raphael
|
57d9bd1543
|
Added friending route to dashboards
|
2010-07-15 15:38:49 -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
|
862787ea93
|
RS, DG; person destruction no longer deletes comments
|
2010-07-15 14:12:01 -07:00 |
|
Raphael
|
2d5d3a2f2d
|
commit more often
|
2010-07-15 13:29:21 -07:00 |
|
Raphael
|
fd18ac6c4b
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-15 13:06:46 -07:00 |
|
maxwell
|
720550189d
|
MS more cleanup
|
2010-07-15 10:59:36 -07:00 |
|
maxwell
|
1412265150
|
MS IZ now we can unsubscribe...probally
|
2010-07-15 10:43:18 -07:00 |
|
maxwell
|
99446d82c4
|
MS IZ more fixes
|
2010-07-15 10:30:51 -07:00 |
|
maxwell
|
f97218c005
|
MS IZ cleanup of pubsub stuff
|
2010-07-15 10:24:41 -07:00 |
|
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
|
c82f41e740
|
Merging in master
|
2010-07-14 12:16:24 -07:00 |
|
Raphael
|
d7d1af8058
|
always import the key
|
2010-07-14 11:55:15 -07:00 |
|
Raphael
|
2e0e904cdb
|
Sending key in friend request response
|
2010-07-14 11:47:36 -07:00 |
|
Raphael
|
a7ba1d8920
|
Assign key before validation
|
2010-07-14 11:25:34 -07:00 |
|
Raphael
|
335f202e2b
|
RS, IZ; Profiles are now embedded
|
2010-07-14 11:22:44 -07:00 |
|
maxwell
|
1b63fbbec7
|
DG MS added pubsub gem, added hub to message queue
|
2010-07-14 11:01:28 -07:00 |
|
Raphael
|
f680c4b71e
|
RS, IZ; Signature Verification now stubbed out outside of encryption specs, green
|
2010-07-14 11:01:21 -07:00 |
|
ilya
|
4a0bd5fc0c
|
RS IZ; removed validations on marshaling and removed key deletion on person destroyw
|
2010-07-13 17:36:18 -07:00 |
|
ilya
|
2862925e2d
|
before validations on create
|
2010-07-13 15:19:39 -07:00 |
|
ilya
|
6614285644
|
params string now a method
|
2010-07-13 15:08:14 -07:00 |
|
ilya
|
0df76daab5
|
assign key
|
2010-07-13 14:44:30 -07:00 |
|
ilya
|
4a53d29939
|
assign key
|
2010-07-13 14:40:10 -07:00 |
|
ilya
|
d4d1aa0fd5
|
RS IZ validations of signature are now called on craeeton of a post
|
2010-07-13 14:34:30 -07:00 |
|
maxwell
|
9e93fd072e
|
DG MS; added subscriber model for ostatus interop
|
2010-07-13 14:32:27 -07:00 |
|
ilya
|
83ea15c97a
|
merging in master
|
2010-07-13 12:23:09 -07:00 |
|
ilya
|
964ee65b11
|
rs iz ; the signature of the signable_accessors are now in the xml
|
2010-07-13 12:21:11 -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 |
|
ilya
|
add9961ca4
|
Now signing only xml accessors other than person
|
2010-07-13 11:41:57 -07:00 |
|
ilya
|
7952385cdb
|
added newlines to post
|
2010-07-13 11:24:57 -07:00 |
|
ilya
|
25940cf567
|
Removed stray puts
|
2010-07-13 11:12:49 -07:00 |
|
ilya
|
a219801c2d
|
Now using detached signatures
|
2010-07-13 11:10:04 -07:00 |
|
ilya
|
6d431e9459
|
signing tests sort of almost done
|
2010-07-13 11:01:27 -07:00 |
|
ilya
|
b9146cbb41
|
RS IZ; now signatures work like in real life
|
2010-07-12 20:42:22 -07:00 |
|
danielvincent
|
ed8ed9be9e
|
DG MS; started Diaspora::XML for ostatus compliance
|
2010-07-12 20:15:12 -07:00 |
|
ilya
|
406c00aeb6
|
RS IZ; using detached signatures and verification things
|
2010-07-12 18:31:20 -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 |
|
ilya
|
174eb7e8f7
|
Merging in Master
|
2010-07-12 11:28:39 -07:00 |
|
maxwell
|
18760f13f8
|
push changes
|
2010-07-12 11:25:53 -07:00 |
|
ilya
|
3dfb55ee85
|
IZ MS pulled in master: this is now the authoritative branch; waiting for dan to fix gpg so we can move on
|
2010-07-11 00:04:08 -04:00 |
|
ilya
|
72e7514535
|
MS fixed your key fingerprint bug. ROML sux. all things which are marshalled as a class need to be after the other fields, because those fields were ignored. also, ids were no long being marshalled correctlyw
|
2010-07-10 23:30:24 -04: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 |
|
ilya
|
1bed575b90
|
Added the Key Fingerprint validation to the person model(defaults to empty string)
|
2010-07-10 06:09:53 -04:00 |
|
ilya
|
7eba033c0d
|
Revert "RS IZ Friday night, key_fingerprint serialization weirdness"
This reverts commit c6e16835df9c5d46d0ec5e0f1860da1ef4c0986a.
|
2010-07-10 05:29:57 -04:00 |
|
ilya
|
8c75761ba1
|
RS IZ Friday night, key_fingerprint serialization weirdness
|
2010-07-10 02:25:48 -04: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 |
|
ilya
|
eec66395c1
|
Removed key password
|
2010-07-09 20:22:01 -04:00 |
|
ilya
|
91e96973ef
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-09 19:17:14 -04:00 |
|
ilya
|
2f5ec3d7c4
|
added a bunch of public keys to test ring
|
2010-07-09 19:17:07 -04:00 |
|
maxwell
|
f5fd0b011a
|
DG MS; upon friend deletion, all connected posts and comments are purged
|
2010-07-09 16:08:00 -07:00 |
|
ilya
|
7eec041846
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into encryption
|
2010-07-09 18:15:22 -04:00 |
|
ilya
|
8c45dd4702
|
testing signing
|
2010-07-09 18:15:17 -04:00 |
|
ilya
|
b802db9194
|
writing signing
|
2010-07-09 17:41:01 -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
|
cfaf13ac7d
|
Use pregenerated keys
|
2010-07-09 13:45:00 -04:00 |
|
maxwell
|
c7e1bc3a46
|
DG MS debugging friend requests
|
2010-07-09 10:18:29 -07:00 |
|
maxwell
|
c2c64d9938
|
MS DG more friend request tests pass
|
2010-07-08 23:14:54 -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
|
895742824d
|
Sped up specs, fixed env
|
2010-07-08 21:23:08 -04: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 |
|
ilya
|
9e8426ceb4
|
RS, IZ; Users now have keys, keyring now in db folder
|
2010-07-08 19:57:10 -04:00 |
|
maxwell
|
900f1080a2
|
DG MS; fixed destroy links for status messages, added link for requests on top nav
|
2010-07-08 14:38:26 -07:00 |
|
maxwell
|
db1811eb61
|
DG MS; cleaned up views for person. Also, pluralized Dashboard and Socket
|
2010-07-08 14:14:03 -07: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
|
1885b5b6b9
|
MS DG fixed friend request
|
2010-07-08 11:30:58 -07:00 |
|
maxwell
|
0c00e6a512
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 10:42:55 -07:00 |
|
maxwell
|
89959bdcb8
|
MS dont make person request remote for now
|
2010-07-08 10:42:42 -07:00 |
|
Raphael
|
2a90fb2bdc
|
Merge branch 'master' of github.com:diaspora/diaspora_rails
|
2010-07-08 10:28:36 -07:00 |
|
Raphael
|
97b1e8dd5d
|
oops
|
2010-07-08 10:28:23 -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 |
|
Raphael
|
4819ce694b
|
removed emspec from gemfile
|
2010-07-08 10:27:22 -07:00 |
|
maxwell
|
09b79293f0
|
merged master
|
2010-07-08 10:19:58 -07:00 |
|
maxwell
|
d04093f456
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-08 10:18:03 -07:00 |
|
maxwell
|
6293f9f585
|
socket is now a controller
|
2010-07-08 10:17:41 -07:00 |
|
ilya
|
3ff32e4905
|
DG IZ; removed views and controller associated with friend object
|
2010-07-08 12:38:14 -04: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 |
|
maxwell
|
a35892428c
|
Merge branch 'master' of github.com:diaspora/diaspora_rails into socket-foo
|
2010-07-07 20:09:27 -07:00 |
|
maxwell
|
947f1a60e7
|
RS MS added url for for the socket controller
|
2010-07-07 18:59:32 -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
|
cc603a7943
|
autotest for rafi
|
2010-07-07 15:27:44 -07:00 |
|
maxwell
|
5350b40e3c
|
broken autotest for rafi
|
2010-07-07 15:27:22 -07:00 |
|
danielvincent
|
d705d39f70
|
DG IZ; added for action to friend request
|
2010-07-07 13:44:06 -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 |
|