maxwell
|
e7f764ffeb
|
attack vector where you take posts from valid (unknown) diaspora people is now fixed
|
2010-10-20 00:42:33 -07:00 |
|
maxwell
|
e7f84f5434
|
fix hcard when parsing friend photo
|
2010-10-19 20:46:43 -07:00 |
|
Raphael
|
9309be2d69
|
Merge branch 'import'
Conflicts:
spec/models/user/invite_spec.rb
|
2010-10-19 16:06:48 -07:00 |
|
Joseph Method
|
e3e4a6b319
|
Continuation of previous commit
|
2010-10-17 19:07:54 -04:00 |
|
ilya
|
9727b356e1
|
the invitations add requests which are now correctly auto accepted
|
2010-10-15 17:20:04 -07:00 |
|
maxwell
|
11925ded2b
|
moving branches
|
2010-10-14 19:15:32 -07:00 |
|
maxwell
|
e218ab6780
|
Merge branch 'master' of github.com:diaspora/diaspora into import
Conflicts:
app/controllers/users_controller.rb
|
2010-10-13 23:09:48 -07:00 |
|
maxwell
|
a86d965079
|
DG MS; importer now takes params for username, password, and diaspora handle
|
2010-10-13 17:07:16 -07:00 |
|
maxwell
|
f04934cbae
|
DG MS; ensure aspect post_ids are only for user
|
2010-10-13 16:54:18 -07:00 |
|
maxwell
|
b395208a51
|
DG MS; added more stuff to importer.
|
2010-10-13 16:42:27 -07:00 |
|
maxwell
|
637a79a99d
|
DG MS; spec for clean_aspects
|
2010-10-13 13:28:10 -07:00 |
|
maxwell
|
55227f3f72
|
DG MS; filter_post method, aspect_clean method
|
2010-10-13 13:10:08 -07:00 |
|
Raphael
|
9a1590fa02
|
Move user module requires out to the user modules definition file
|
2010-10-13 11:18:06 -07:00 |
|
danielvincent
|
0315869a24
|
all specs should pass again after merge
|
2010-10-13 09:43:58 -07:00 |
|
danielvincent
|
59c3be41b3
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 09:21:27 -07:00 |
|
danielvincent
|
7ea3fe5bf1
|
MS DG; verifys implemented, but need more tests
|
2010-10-12 18:53:12 -07:00 |
|
danielvincent
|
92e5622247
|
DG MS; adding verification methods to importer.
|
2010-10-12 17:41:09 -07:00 |
|
ilya
|
9b249281a1
|
moved verify comment sig before any saving goes on
|
2010-10-12 16:01:36 -07:00 |
|
ilya
|
b53462ee93
|
Merge branch 'malicious_friend_refactor' of github.com:diaspora/diaspora
|
2010-10-12 15:55:02 -07:00 |
|
ilya
|
c00a70dde1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 15:54:37 -07:00 |
|
danielvincent
|
8720dfa950
|
DG MS; made test slower. posts now export correctly.
|
2010-10-12 15:33:08 -07:00 |
|
ilya
|
d8439c82ee
|
going calling by webfinger only once
|
2010-10-12 12:21:57 -07:00 |
|
danielvincent
|
1d1ff7e330
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-12 11:34:31 -07:00 |
|
danielvincent
|
2e8bba1a04
|
MS DG adding more to exporter and importer
|
2010-10-12 11:34:13 -07:00 |
|
ilya
|
ee2d134cb0
|
receiving spec is green
|
2010-10-11 19:20:00 -07:00 |
|
danielvincent
|
948c5d9b02
|
DG MS; end of day.
|
2010-10-11 19:04:27 -07:00 |
|
ilya
|
03df0ff716
|
parser spec is green
|
2010-10-11 18:22:19 -07:00 |
|
Raphael
|
c8f864a69b
|
Finish fixing move_private_key
|
2010-10-11 17:22:53 -07:00 |
|
danielvincent
|
b2f3074eb0
|
DG MS; scenario for importer spec
|
2010-10-11 17:00:42 -07:00 |
|
Raphael
|
a372ec33be
|
fixing uninitialized constant in rake task
|
2010-10-11 16:36:34 -07:00 |
|
danielvincent
|
0f7807222b
|
DG MS; cleaned up method
|
2010-10-11 11:38:08 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -07:00 |
|
ilya
|
3887712115
|
slight refactor of receiving spec, wrote a spec that exposed malicious friend attack
vector
|
2010-10-09 21:34:53 -07:00 |
|
Sarah Mei
|
c646db956e
|
CI does a proper export. FINALLY.
|
2010-10-08 21:13:13 -06:00 |
|
Raphael
|
d72c4de438
|
Revert "CGI unescape incoming salmons"
This reverts commit 6cbe4075f4.
|
2010-10-08 16:08:35 -07:00 |
|
Raphael
|
f09a54b67f
|
Revert "arguments..."
This reverts commit 8049aa20e8.
|
2010-10-08 16:08:25 -07:00 |
|
Raphael
|
8049aa20e8
|
arguments...
|
2010-10-08 16:01:24 -07:00 |
|
Raphael
|
6cbe4075f4
|
CGI unescape incoming salmons
|
2010-10-08 15:59:32 -07:00 |
|
Sarah Mei
|
bc75c4acf5
|
Let's try putting display in the rake command.
|
2010-10-08 15:22:02 -06:00 |
|
Sarah Mei
|
4e3e6d9562
|
rake task starts a virtual framebuffer before running tests, stops it after
|
2010-10-08 14:55:53 -06:00 |
|
Sarah Mei
|
ebef212079
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 14:14:48 -06:00 |
|
Sarah Mei
|
564217684f
|
Fail CI if exitstatus isn't 0. *sigh*
|
2010-10-08 14:14:39 -06:00 |
|
Raphael
|
76e77c2bf1
|
refactor hcard for faster testing
|
2010-10-08 13:06:21 -07:00 |
|
Sarah Mei
|
b02e266130
|
Don't need a bundle install in the ci task
|
2010-10-08 01:07:07 -06:00 |
|
Sarah Mei
|
c0bf7ab5cd
|
Rake task for CI that includes a bundle install
|
2010-10-08 00:39:30 -06:00 |
|
danielvincent
|
7a56d82873
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:56:22 -07:00 |
|
danielvincent
|
4deea95057
|
DG MS; export photos button in users#edit
|
2010-10-07 16:56:10 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
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 |
|