Commit graph

2398 commits

Author SHA1 Message Date
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
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
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
Stephen Caudill
3e499c0f1b Hack the rake tasks to run cucumber + rspec 2010-09-26 11:39:35 -04:00
Stephen Caudill
5f2d4ba073 Use the mongo_mapper and cucumber Cleaner strategy 2010-09-26 11:35:50 -04:00
Stephen Caudill
9038d6b0ed Allow connections to be passed through to Selenium 2010-09-26 11:35:50 -04:00
Stephen Caudill
8a93c67166 Add the Hashrocket default step definitions
Tweaked for mongomapper and diaspora
2010-09-26 11:35:50 -04:00
Stephen Caudill
05c2da81e5 Add cucumber and run the generator 2010-09-26 11:35:50 -04:00
Stephen Caudill
af938fe74f Remove unused/broken Selenium tests 2010-09-26 11:33:41 -04:00
Stephen Caudill
294da214f7 Make ruby-debug available in test env 2010-09-26 11:31:03 -04:00
Sarah Mei
64e1912c37 Disabled image resizing in specs => 15% faster test suite. FTW 2010-09-26 00:40:40 -07:00
Yuval Adam
f2ddb8a39c added Hebrew (he) locale files 2010-09-26 04:49:39 +08: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
ebf4999054 Task to remove consecutive blank lines 2010-09-25 12:11:04 -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
Stephen Caudill
4cfc7e2f89 Add description for retab task 2010-09-25 11:03:12 -04:00
Raphael
beda67aca6 Shorten git show stuff 2010-09-24 17:51:51 -07:00
Chiggins
f74b0a6f2c Added "shadow text" to caption text field while editing a photo, since about every other text field has "shadow text". 2010-09-25 08:13:16 +08:00
Raphael
f4d18ce9bc don't use request.host as data 2010-09-24 17:12:18 -07:00
danielvincent
d59330264d fixed syntax error in italian locale 2010-09-24 16:18:41 -07:00
Raphael
791fb5b120 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-24 15:51:18 -07:00
Raphael
9d2ee2f961 Merge branch 'master' into HEAD 2010-09-24 15:50:48 -07:00
sennewood
dcedc5d505 Added the missing lines of code and translated them. 2010-09-25 06:39:59 +08:00
sennewood
16e5f972d1 Translation correction 2010-09-25 06:39:59 +08:00
sennewood
e2db21d7b0 Use double quotes in locale files 2010-09-25 06:39:59 +08:00
maco
ea2739e892 ubuntu-setup.bash: fix s/blunder/bundler/ and s/elsif/elif/ 2010-09-25 06:38:20 +08:00
maco
c5aa22fd28 ubuntu-setup.bash: for rubygems, use maverick's repo or if lucid use ppa or if old use tarball. create /var/lib/gems/1.8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games-friendly symlink if using debs 2010-09-25 06:38:19 +08:00
Daniel Thomas
8a30a287af Make ubuntu-setup.bash executable
So that it can run directly when checked out without needing to have
chmod +x ubuntu-setup.bash run first.

Signed-off-by: Daniel Thomas <drt24@srcf.ucam.org>
2010-09-25 06:38:07 +08:00
Daniel Thomas
043dadf0ea Update copyright information on ubuntu-setup.bash
Adding Diaspora Inc. copyright and reference to the AGPL and noting that
Mackenzie Morgan (maco) and I have made contributions to the file.

Signed-off-by: Daniel Thomas <drt24@srcf.ucam.org>
2010-09-25 06:38:06 +08:00
hemanth
585cc7a480 Check if universal repository is enabled or not. 2010-09-25 06:36:25 +08:00
hemanth
dc0fc1f445 set -e removed as the rules change from one Bash version to another, as Bash attempts to track the extremely slippery POSIX definition of this "feature". When a SubShell is involved, it gets worse still -- the behavior changes depending on whether Bash is invoked in POSIX mode. 2010-09-25 06:36:25 +08:00
hemanth
5682cf59ab Added a check on if the user has already cloned and also a set -e to exit immediately if a command exits with a non-zero status. 2010-09-25 06:36:25 +08:00