danielvincent
|
0f5a09783d
|
positioning
|
2010-10-07 14:32:45 -07:00 |
|
danielvincent
|
09dad2d80f
|
DG MS; exporter includes comments. exporter spec
|
2010-10-07 14:10:14 -07:00 |
|
danielvincent
|
7e8bf40a87
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 12:21:31 -07:00 |
|
danielvincent
|
8a130a68aa
|
DG MS; xml exporter file added
|
2010-10-07 12:21:14 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
Raphael
|
67fc01aa36
|
Send friend_acceptances correctly
|
2010-10-07 09:49:34 -07:00 |
|
ilya
|
bb6866fa0f
|
removed depricated non-encrypted author info fields from salmon
|
2010-10-06 23:20:28 -07:00 |
|
danielvincent
|
ee4c197b89
|
fixed hcard finder on image
|
2010-10-06 18:32:56 -07:00 |
|
danielvincent
|
6b74053e06
|
scratch that last commit
|
2010-10-05 20:37:28 -07:00 |
|
danielvincent
|
982f51b9c7
|
prepend pod_url to image paths
|
2010-10-05 20:31:40 -07:00 |
|
danielvincent
|
91bbd607e6
|
user avatar in public feed activity:subject
|
2010-10-05 20:27:33 -07:00 |
|
danielvincent
|
dc88110716
|
img tag in hcard
|
2010-10-05 20:22:13 -07:00 |
|
danielvincent
|
fc31eb405d
|
removing logging messages
|
2010-10-05 18:34:56 -07:00 |
|
danielvincent
|
7f652eb81c
|
more logging
|
2010-10-05 18:03:17 -07:00 |
|
danielvincent
|
57e47e5a68
|
removed excess dumb. pubsub should work now
|
2010-10-05 17:58:56 -07:00 |
|
danielvincent
|
cc01345edd
|
debug statements
|
2010-10-05 17:56:13 -07:00 |
|
danielvincent
|
a063207a0a
|
logger instead of debug
|
2010-10-05 17:52:21 -07:00 |
|
danielvincent
|
d890b57b13
|
temp logger message
|
2010-10-05 17:45:35 -07:00 |
|
danielvincent
|
e01eedef95
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:26:41 -07:00 |
|
danielvincent
|
0e8b84fb96
|
publish instead of get
|
2010-10-05 17:26:26 -07:00 |
|
Raphael
|
2df3cf353b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:24:18 -07:00 |
|
Raphael
|
5847e7767d
|
Add profile photo url to hcard parser
|
2010-10-05 17:24:01 -07:00 |
|
danielvincent
|
c01bbbb3e0
|
capitalization error. should push to pubsub now.
|
2010-10-05 17:24:00 -07:00 |
|
danielvincent
|
830b3772d5
|
self reference in atom
|
2010-10-05 16:59:55 -07:00 |
|
danielvincent
|
09b861c7a3
|
remove .atom from public url
|
2010-10-05 16:51:27 -07:00 |
|
danielvincent
|
6723a51149
|
correctly indent xml
|
2010-10-05 16:40:50 -07:00 |
|
danielvincent
|
11857a9308
|
fixing id field in atom
|
2010-10-05 16:35:29 -07:00 |
|
danielvincent
|
4a8a21b95f
|
public fix
|
2010-10-05 16:28:01 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
0d2d5b65fb
|
removed the logging statements, now servers communicate sucessfully and only re-encrypt the header for people
|
2010-10-03 18:08:18 -07:00 |
|
ilya
|
3eaf4e0ba1
|
a couple of logger lines to help debug on remote
|
2010-10-03 17:33:31 -07:00 |
|
ilya
|
dadacbd092
|
removed whitespace striping
|
2010-10-03 13:33:01 -07:00 |
|
ilya
|
f9cecd9d89
|
specs are green
|
2010-10-02 13:03:11 -07:00 |
|
ilya
|
b6a912dd02
|
slowly getting specs to pass on with the new api
|
2010-09-30 15:17:53 -07:00 |
|
ilya
|
46bf0cfd99
|
roundtrip done, just need to clean and move to the new api
|
2010-09-28 15:11:01 -07:00 |
|
ilya
|
c7d29b29c8
|
the salmon now encrypts the activity, and stores the aes key in the header
|
2010-09-28 13:22:19 -07:00 |
|
ilya
|
6eede48f9f
|
started to refactor the salmon spec, changed data in to be parsed data
to be more clear
|
2010-09-28 12:39:55 -07:00 |
|
ilya
|
904143d100
|
rake task to move the private key
|
2010-09-28 11:25:18 -07:00 |
|
danielvincent
|
762646dbe8
|
make the director more forgiving
|
2010-09-27 22:11:14 -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
|
58b688aa68
|
fixed builder spec
|
2010-09-27 21:28:21 -07:00 |
|
danielvincent
|
eb7244e07c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:07:01 -07:00 |
|
ilya
|
1225291fc2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:01:25 -07:00 |
|
danielvincent
|
26a4dc76a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 18:34:55 -07:00 |
|
danielvincent
|
3b8ddf76a3
|
temp route for atom feed. also, public atom currently displays all posts.
|
2010-09-27 18:34:47 -07:00 |
|
ilya
|
7852c346f2
|
mode the visible posts api more general and moved to it on the public controller
|
2010-09-27 18:31:37 -07:00 |
|
danielvincent
|
df800dc87e
|
ostatus builder
|
2010-09-27 17:58:44 -07:00 |
|
Raphael
|
efe85a4c28
|
db:reset should call db:seed:dev, not db:seed:tom
|
2010-09-27 16:54:42 -07:00 |
|
ilya
|
b823213c0d
|
added a generate:secret_token task, and added an initializer to generate one if the file does not exist
|
2010-09-27 15:29:55 -07:00 |
|
ilya
|
9ff3263444
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 10:03:41 -07:00 |
|
danielvincent
|
b4d4986758
|
removed inclusion block
|
2010-09-26 22:20:01 -07:00 |
|
ilya
|
cf0df90dae
|
moved the private key into user where it belongs, two failing cucumber tests
|
2010-09-26 22:08:42 -07:00 |
|
Dorian
|
e792344c0e
|
Use improved whitespace:scrub_gratuitous_newlines
|
2010-09-26 12:52:39 -04:00 |
|
Dorian
|
4223769df0
|
Improve task which remove consecutive blank lines
|
2010-09-26 12:50:25 -04:00 |
|
Dorian
|
d8c497177f
|
Improve whitespace:cleanup and whitespace:retab
|
2010-09-26 12:50:18 -04:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Stephen Caudill
|
3e499c0f1b
|
Hack the rake tasks to run cucumber + rspec
|
2010-09-26 11:39:35 -04:00 |
|
Stephen Caudill
|
05c2da81e5
|
Add cucumber and run the generator
|
2010-09-26 11:35:50 -04:00 |
|
Stephen Caudill
|
af938fe74f
|
Remove unused/broken Selenium tests
|
2010-09-26 11:33:41 -04:00 |
|
Stephen Caudill
|
ebf4999054
|
Task to remove consecutive blank lines
|
2010-09-25 12:11:04 -04:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Stephen Caudill
|
4cfc7e2f89
|
Add description for retab task
|
2010-09-25 11:03:12 -04:00 |
|
Raphael
|
5c32cbaee8
|
Fix requires in rake task
|
2010-09-24 14:40:30 -07:00 |
|
Raphael
|
f11a481ed7
|
Actually do something
|
2010-09-22 22:59:17 -07:00 |
|
Raphael
|
494f765066
|
fix_diaspora_handle rake task
|
2010-09-22 22:57:53 -07:00 |
|
Thomas Krehbiel
|
10e6ff9df8
|
Fix for sending unlimited duplicate friend requests
|
2010-09-22 18:16:10 -04:00 |
|
danielvincent
|
4a3bfea1ba
|
DG MS; cleaned spec
|
2010-09-21 17:43:46 -07:00 |
|
Raphael
|
11d31901e4
|
IZ, RS, Pulled receiving out of user file, refactored receive method to be clearer
|
2010-09-21 13:59:52 -07:00 |
|
Raphael
|
08df7e1250
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-21 11:03:32 -07:00 |
|
Raphael
|
50414fef40
|
Remove unused method from message handler
|
2010-09-21 11:03:21 -07:00 |
|
danielvincent
|
ca97d792af
|
DG IZ; fixing querying bug in aspect_by_id
|
2010-09-20 18:08:59 -07:00 |
|
danielvincent
|
9c334e24e4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-20 17:26:35 -07:00 |
|
danielvincent
|
e588d7ab6a
|
DG IZ moving friends is now ajaxy
|
2010-09-20 17:26:20 -07:00 |
|
Raphael
|
8dd11c0c95
|
Add a couple specs to friending
|
2010-09-20 16:41:03 -07:00 |
|
danielvincent
|
af9cda52af
|
DG IZ; always query through the current_user in the controllers.
|
2010-09-20 13:18:11 -07:00 |
|
Raphael
|
c520fb71a7
|
Moved socket out to separate process. Multiple thins should now be possible
|
2010-09-16 21:34:15 -07:00 |
|
Raphael
|
b0c87fcffa
|
Add a little more feedback to rake task
|
2010-09-16 17:04:59 -07:00 |
|
Raphael
|
dea0912c28
|
Do a more specific query in the fix rake task
|
2010-09-16 16:41:28 -07:00 |
|
maxwell
|
bbc7492af4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-16 16:17:23 -07:00 |
|
maxwell
|
1e8f10f1af
|
MS rake task to fix broken local people.... let me test it first on a server, but then you can run rake db:fix_diaspora_handle
|
2010-09-16 16:12:45 -07:00 |
|
danielvincent
|
0c7ba49e34
|
DG IZ; aspect deletion
|
2010-09-16 16:03:18 -07:00 |
|
Jamie Wilkinson
|
295ae7fa93
|
'rake whitespace:clean' => 'rake whitespace:cleanup'
|
2010-09-16 13:19:03 +08:00 |
|
Stephen Caudill
|
3d939a1119
|
Add task for retabbing all files in project
Replace hard tabs with two character soft tabs.
|
2010-09-16 13:16:10 +08:00 |
|
Jamie Wilkinson
|
fbdd50172d
|
Cleanup stray whitespace
|
2010-09-16 10:07:59 +08:00 |
|
Jamie Wilkinson
|
0c6c4af277
|
'rake whitespace:cleanup' task
|
2010-09-16 10:07:58 +08:00 |
|
Raphael
|
708e9f88a5
|
Spell our own name right
|
2010-09-15 17:56:18 -07:00 |
|
maxwell
|
84c60e5f2e
|
DG MS fixing webfinger, i hope to goodness
|
2010-09-15 13:28:06 -07:00 |
|
Raphael
|
aa3ebe372c
|
License notices replaced
|
2010-09-15 10:58:48 -07:00 |
|
Daniel Vincent Grippi
|
b2b60af8aa
|
Albums_by_aspect now takes :all
|
2010-09-13 17:32:29 -07:00 |
|
Daniel Vincent Grippi
|
1b92bcd17c
|
Add albums_by_aspect method to user
|
2010-09-13 17:26:24 -07:00 |
|
Daniel Vincent Grippi
|
40ecf176e8
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-13 14:26:15 -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
|
b05d106aed
|
Remove user_refs from Person, put pendings in the broken photo specs
|
2010-09-13 12:16:43 -07:00 |
|
Raphael
|
44a1f82da9
|
Rename group to aspect
|
2010-09-13 10:38:38 -07:00 |
|
Daniel Vincent Grippi
|
62994f1660
|
retractions should now actually websocket again
|
2010-09-12 21:24:22 -07:00 |
|
Raphael
|
04883f914f
|
Remove unused webhooks methods
|
2010-09-10 16:43:31 -07:00 |
|
Raphael
|
dd166921a4
|
Salmon friend retractions
|
2010-09-10 16:38:40 -07:00 |
|
Raphael
|
6afaf73c30
|
Merge branch 'salmon' of github.com:diaspora/diaspora
|
2010-09-10 16:27:13 -07:00 |
|
Raphael
|
ab6d631a27
|
White space in user file, deleting net/curl as unused
|
2010-09-10 16:25:19 -07:00 |
|
maxwell
|
98e882b2f0
|
MS reloading friend_request.person
|
2010-09-10 16:19:51 -07:00 |
|