Sarah Mei
|
2a24de2ba7
|
Changing spec to pending because it hasn't been implemented yet
|
2010-10-10 13:29:03 -07:00 |
|
maxwell
|
fd0902abb4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-10 11:54:16 -07:00 |
|
maxwell
|
0541833c18
|
stop the file include madness. using File.join and Rails.root for includes everywhere I could
|
2010-10-10 11:54:08 -07:00 |
|
Sarah Mei
|
ac85fbcc64
|
DevUtilitiesControllerSpec runs under 1.9.2.
FileUtils.mv with the :force option works under 1.8.7 if the source file doesn't exist, but fails under 1.9.2.
|
2010-10-10 11:52:19 -07:00 |
|
ilya
|
1ac410b590
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-09 21:44:26 -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
|
4da2f9cf58
|
Fix pending spec in SocketsControllerSpec
|
2010-10-09 21:58:46 -06:00 |
|
Raphael
|
6064b2e022
|
Add a spec, move another to posting
|
2010-10-08 14:37:22 -07:00 |
|
danielvincent
|
154ec95717
|
killed the public tab. made a broadcast button in everyone tab
|
2010-10-08 14:06:49 -07:00 |
|
danielvincent
|
b70cf713ec
|
removed old pending spec
|
2010-10-08 09:16:11 -07:00 |
|
Sarah Mei
|
4a88ac22c2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 02:15:17 -06:00 |
|
Sarah Mei
|
899d82b766
|
Fix 1 of 2 pending photo specs.
|
2010-10-08 02:15:07 -06:00 |
|
danielvincent
|
4bb26cfce4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-08 00:46:41 -07:00 |
|
danielvincent
|
fab9e8b6eb
|
cleaned request spec
|
2010-10-08 00:46:24 -07:00 |
|
Sarah Mei
|
ce9aa3600d
|
Refactor user friending spec
|
2010-10-08 01:42:48 -06:00 |
|
Sarah Mei
|
511cd8fa1c
|
Clean up reloading in user friending spec.
|
2010-10-08 01:23:33 -06:00 |
|
Raphael
|
3632143959
|
Take out pending on spec that exposes issue 150
|
2010-10-07 17:54:26 -07:00 |
|
Raphael
|
1d463d22a1
|
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
|
2010-10-07 16:50:19 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
0ebb597b72
|
DG MS; test for users#export
|
2010-10-07 15:22:03 -07:00 |
|
Sarah Mei
|
b63fb5d7a6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 15:27:18 -06:00 |
|
Sarah Mei
|
4dba2d7c35
|
Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number.
|
2010-10-07 15:27:04 -06:00 |
|
danielvincent
|
7a3d168123
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 14:17:22 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
maxwell
|
ec4c63ada7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:51:10 -07:00 |
|
maxwell
|
d638bdb018
|
MS IZ password change field is now in edit profile
|
2010-10-05 17:49:06 -07:00 |
|
Stoyan Gaydarov
|
dbacff250a
|
added extra user spec
|
2010-10-06 08:27:25 +08:00 |
|
Stoyan Gaydarov
|
9eb8fe0c5a
|
use the correct pod url in the user spec
|
2010-10-06 08:27:25 +08:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
ilya
|
7b690f5dcb
|
slight publics controller spec refactor
|
2010-10-02 13:20:23 -07:00 |
|
ilya
|
f9cecd9d89
|
specs are green
|
2010-10-02 13:03:11 -07:00 |
|
ilya
|
7dcde292e1
|
user posting spec is now green, now stubbing on the apropriate method
|
2010-10-02 12:34:16 -07:00 |
|
ilya
|
b6a912dd02
|
slowly getting specs to pass on with the new api
|
2010-09-30 15:17:53 -07:00 |
|
ilya
|
e9521d7144
|
tiny commit to switch branches
|
2010-09-29 12:15:54 -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 |
|
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 |
|
Raphael
|
6100b318e4
|
More accurately describe a spec
|
2010-09-27 18:12:55 -07:00 |
|
danielvincent
|
df800dc87e
|
ostatus builder
|
2010-09-27 17:58:44 -07:00 |
|
ilya
|
6e407572c4
|
removed unused repost method, going through the warden object
|
2010-09-27 17:27:49 -07:00 |
|
Raphael
|
591347a77a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 16:54:18 -07:00 |
|
Raphael
|
e9f433e12f
|
Add spec for not overwriting the image_url on profile update
|
2010-09-27 16:54:08 -07:00 |
|
ilya
|
08b9aa864a
|
Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
|
2010-09-27 15:39:50 -07:00 |
|