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
|
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 |
|
danielvincent
|
762646dbe8
|
make the director more forgiving
|
2010-09-27 22:11:14 -07:00 |
|
ilya
|
d8c49e8852
|
moved stuff around in the readme
|
2010-09-27 22:06:47 -07:00 |
|
danielvincent
|
44c29cf8e6
|
deploy_config back to master
|
2010-09-27 21:57:52 -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 |
|
Raphael
|
77356d7a17
|
Moving ubuntu-setup.bash to script/
|
2010-09-27 17:55:04 -07:00 |
|
Raphael
|
fad27483cd
|
Pulling in drt24's changes to ubuntu-setup.bash
|
2010-09-27 17:54:20 -07:00 |
|
ilya
|
6e407572c4
|
removed unused repost method, going through the warden object
|
2010-09-27 17:27:49 -07:00 |
|
ilya
|
c2b84fd9c6
|
added a public key to post
|
2010-09-27 16:59:54 -07:00 |
|
Raphael
|
efe85a4c28
|
db:reset should call db:seed:dev, not db:seed:tom
|
2010-09-27 16:54:42 -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
|
52313b799b
|
added a warning, moved connected as into a partial, removed the
publishing box from settings page
|
2010-09-27 16:31:19 -07:00 |
|
ilya
|
d41b370630
|
removing the fb feed for now
|
2010-09-27 16:20:27 -07:00 |
|
ilya
|
a8f05244ba
|
localization should be fixed
|
2010-09-27 16:07:24 -07:00 |
|
ilya
|
50234b095b
|
had to move translation around slightly, now the profile edit will be missing a template
|
2010-09-27 16:02:08 -07:00 |
|
ilya
|
7b29e6ec26
|
checking that a user is logged in before doing fb checking
|
2010-09-27 15:50:52 -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 |
|
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 |
|
Raphael
|
12bd0f2301
|
Merge branch 'master' of http://github.com/uiri/diaspora
|
2010-09-27 14:48:11 -07:00 |
|
Guillermo
|
1a876355d5
|
Some fixes in spanish locale
|
2010-09-28 03:02:47 +08:00 |
|
michael.scheffler
|
2c55e70067
|
Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url]
|
2010-09-28 02:50:56 +08:00 |
|
Daniele Di Sarli
|
6b9bcfda63
|
Corrected Italian translation
|
2010-09-28 02:41:59 +08:00 |
|
Raphael
|
2f31e036e3
|
Merge branch 'cz' of http://github.com/koo5/diaspora
|
2010-09-27 11:36:04 -07:00 |
|
Raphael
|
1ab536bf04
|
Merge branch 'master' of http://github.com/sarahmei/diaspora
|
2010-09-27 11:09:14 -07:00 |
|
Raphael
|
ce0accafbb
|
Don't depend on user => person delagation so we can eventually get rid of that, thanks astronouth7303
|
2010-09-27 11:03:48 -07:00 |
|
Raphael
|
ef2647c188
|
Merge branch 'master' of http://github.com/yarons/diaspora
|
2010-09-27 10:52:32 -07:00 |
|
Raphael
|
4f89f957f1
|
Putting in version switches for gems that don't work in 1.9
|
2010-09-27 10:51:29 -07:00 |
|
Raphael
|
1e495c676c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 10:39:41 -07:00 |
|
Raphael
|
0aa8e0e753
|
Unfortunately, we can't put ruby-debug in the gemfile because it breaks 1.9.2 compatibility. Just put it back in locally when you want to use it, or figure out how to do a switch by ruby verison in the Gemfile
|
2010-09-27 10:39:29 -07:00 |
|
Raphael
|
139102e488
|
Merge branch 'master' of http://github.com/bastos/diaspora
|
2010-09-27 10:11:28 -07:00 |
|
ilya
|
98bc2df841
|
removed the encryption key= method, and user with private key factory
|
2010-09-27 10:10:54 -07:00 |
|
ilya
|
9ff3263444
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 10:03:41 -07:00 |
|