ilya
|
45d40f27d9
|
changed the deploy config back to master
|
2010-10-05 13:06:55 -07:00 |
|
ilya
|
57b61f6827
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 13:00:54 -07:00 |
|
ilya
|
63cb7dcbdd
|
Fb friends are displayed only once
|
2010-10-05 13:00:42 -07:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
ilya
|
85f71aa4aa
|
added the deploy task to symlink the fb_config
|
2010-10-05 12:38:20 -07:00 |
|
ilya
|
82455981b8
|
added fb_config to gitignore
|
2010-10-05 12:21:33 -07:00 |
|
ilya
|
05968db7be
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 12:17:07 -07:00 |
|
Raphael
|
1fa732498b
|
Update sprinkle script
|
2010-10-05 11:55:47 -07:00 |
|
Raphael
|
bb88a6fb8c
|
Merge branch 'salmon-refactor'
|
2010-10-05 09:47:10 -07:00 |
|
ilya
|
44414d545d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 09:42:12 -07:00 |
|
Raphael
|
be909e27d6
|
Deleting adams
|
2010-10-04 14:49:27 -04:00 |
|
Raphael
|
e60585862a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-04 14:47:40 -04:00 |
|
Maxwell Salzberg
|
a09a6d82b7
|
updated bundler dependency to include newer ones
|
2010-10-04 09:45:12 -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
|
ce4f8cab8b
|
not encrypting the entire thing
|
2010-10-03 17:39:16 -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 |
|
Raphael
|
2cd8cf0621
|
Remove a bunch of deleted backer servers
|
2010-10-02 20:30:37 -04:00 |
|
ilya
|
88dafbf5cc
|
changed deploy branch
|
2010-10-02 13:29:36 -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
|
304e4ad32b
|
removed the puts
|
2010-10-02 12:37:53 -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
|
4ce4ce1951
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon_refactor
|
2010-09-30 11:05:34 -07:00 |
|
danielvincent
|
f1f7ce338f
|
tar ignores files specified in .gitignore
|
2010-09-30 13:40:36 -04:00 |
|
ilya
|
69e94cfab1
|
Merge branch 'master' of github.com:diaspora/diaspora into salmon_refactor
|
2010-09-29 19:31:56 -07:00 |
|
danielvincent
|
a53d15f50a
|
update gitignore
|
2010-09-29 17:45:36 -04:00 |
|
danielvincent
|
e145cbab5b
|
tar the app's source and throw it in the public folder on server boot.
|
2010-09-29 17:42:56 -04:00 |
|
ilya
|
cbe65aeb49
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-29 12:16:07 -07:00 |
|
ilya
|
e9521d7144
|
tiny commit to switch branches
|
2010-09-29 12:15:54 -07:00 |
|
danielvincent
|
fa8cc5b876
|
moz box shadow does not like negative blur
|
2010-09-28 23:24:04 -04: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 |
|
danielvincent
|
f5a57a6f4a
|
photo partial now has labels
|
2010-09-28 13:05:58 -07:00 |
|
danielvincent
|
e0159aaaeb
|
small visual tweaks
|
2010-09-28 12:58:34 -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
|
4627c5338e
|
found placement of all aspects tab confusing; moved it to be the first tab
|
2010-09-28 12:29:35 -07:00 |
|
danielvincent
|
0a34c24f22
|
tag fix
|
2010-09-28 11:51:52 -07:00 |
|
danielvincent
|
577b5545bf
|
comment blocks slide
|
2010-09-28 11:50:13 -07:00 |
|
ilya
|
904143d100
|
rake task to move the private key
|
2010-09-28 11:25:18 -07:00 |
|
danielvincent
|
b068eaf15c
|
limit content width to 600px
|
2010-09-28 10:48:45 -07:00 |
|
danielvincent
|
241ea4559a
|
gradients on aspect tags on status messages
|
2010-09-28 10:41:38 -07:00 |
|
danielvincent
|
bf15514bc9
|
redirect users#public to root_url if user does not exist.
|
2010-09-28 10:23:03 -07:00 |
|
danielvincent
|
263615ad14
|
all status messages have labels
|
2010-09-27 23:51:20 -07:00 |
|
danielvincent
|
79926da3d3
|
removed owner image repeat
|
2010-09-27 23:16:19 -07:00 |
|
danielvincent
|
cb7c35af73
|
fixed thumbnail positioning
|
2010-09-27 23:15:48 -07:00 |
|
danielvincent
|
bf587be461
|
public indicator tag on status message partial.
|
2010-09-27 22:50:11 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
500e6cc4cf
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 22:16:10 -07:00 |
|