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 |
|
Yaron Shahrabani
|
08c0c345f5
|
Updated Hebrew translation
|
2010-09-27 09:49:38 +02:00 |
|
danielvincent
|
b4d4986758
|
removed inclusion block
|
2010-09-26 22:20:01 -07:00 |
|
ilya
|
f36b99b03c
|
changed the deploy_config to play on remote
|
2010-09-26 22:13:28 -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
|
4bb4602762
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-26 13:14:50 -07:00 |
|
Stephen Caudill
|
43fa70f90b
|
Label error notification as such.
|
2010-09-26 16:10:13 -04: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 |
|
Stephen Caudill
|
8d17b3537c
|
Refactor to use a Background
|
2010-09-26 14:18:58 -04: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
|
611852bb74
|
Use rake whitespace:cleanup
|
2010-09-26 12:53:22 -04:00 |
|
Dorian
|
7e73f20c2a
|
Use whitespace:retab; manually retab ubuntu-setup.bash
|
2010-09-26 12:52:46 -04:00 |
|
Dorian
|
e792344c0e
|
Use improved whitespace:scrub_gratuitous_newlines
|
2010-09-26 12:52:39 -04:00 |
|
Dorian
|
4223769df0
|
Improve task which remove consecutive blank lines
|
2010-09-26 12:50:25 -04:00 |
|
Dorian
|
d8c497177f
|
Improve whitespace:cleanup and whitespace:retab
|
2010-09-26 12:50:18 -04:00 |
|
Dorian
|
6ffc03a4c9
|
Big clean up: delete trailing whitespace
|
2010-09-26 12:48:40 -04:00 |
|
Stephen Caudill
|
fd69f0201f
|
User creates an aspect
|
2010-09-26 12:05:39 -04:00 |
|
Uiri
|
151a57cc93
|
well, that explains why it was adding the url variable. Fixed so that now new pictures work too.
|
2010-09-26 11:47:34 -04:00 |
|
Stephen Caudill
|
3e499c0f1b
|
Hack the rake tasks to run cucumber + rspec
|
2010-09-26 11:39:35 -04:00 |
|