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 |
|
ilya
|
8f55852ea9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 15:30:27 -07:00 |
|
michael.scheffler
|
2c55e70067
|
Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url]
|
2010-09-28 02:50:56 +08:00 |
|
Raphael
|
1ab536bf04
|
Merge branch 'master' of http://github.com/sarahmei/diaspora
|
2010-09-27 11:09:14 -07:00 |
|
ilya
|
98bc2df841
|
removed the encryption key= method, and user with private key factory
|
2010-09-27 10:10:54 -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 |
|
Sarah Mei
|
68a8ecb05f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-26 13:08:56 -07:00 |
|
Sarah Mei
|
5d1afe21be
|
Refactor user specs to speed up spec runs.
|
2010-09-26 13:08:30 -07:00 |
|
Sarah Mei
|
0ec074be6d
|
Remove annoying deprecation warning from spec runs
Add spec for validation hook
|
2010-09-26 10:00:29 -07:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Sarah Mei
|
64e1912c37
|
Disabled image resizing in specs => 15% faster test suite. FTW
|
2010-09-26 00:40:40 -07:00 |
|
Sarah Mei
|
17757a2e2d
|
Merging upstream changes
|
2010-09-25 15:57:59 -07:00 |
|
Stephen Caudill
|
72cefc6265
|
Move relationship_flow spec to its helper spec
|
2010-09-25 13:18:46 -04:00 |
|
Stephen Caudill
|
8c6dff35c0
|
Remove unnecessary includes
|
2010-09-25 13:11:44 -04:00 |
|
Stephen Caudill
|
536cea5e44
|
Remove consecutive empty lines
|
2010-09-25 12:06:39 -04:00 |
|
Stephen Caudill
|
821643deb9
|
Use the new style of spec_helper require
|
2010-09-25 11:27:59 -04:00 |
|
Sarah Mei
|
e3ec00595d
|
Cleaned up file path joining in some of the dev utilties.
Backfilled tests where necessary to make sure changes didn't break existing code.
|
2010-09-25 04:34:48 -07:00 |
|
ilya
|
e414558f79
|
passing the right things to the partial
|
2010-09-24 15:52:29 -07:00 |
|
Raphael
|
ae7c869bc3
|
Add specs for album controller failure
|
2010-09-24 15:01:36 -07:00 |
|