Commit graph

2527 commits

Author SHA1 Message Date
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
koo5
28e925e40a More czech translation goodness. I've added distance_in_words translations, feel free to delete it if it belongs somewhere/sometime else. 2010-09-26 06:01:39 +02:00
Sarah Mei
17757a2e2d Merging upstream changes 2010-09-25 15:57:59 -07:00
Uiri
ceb4f71714 Don't want my personal changes to be pulled into the master with my pull request 2010-09-25 18:35:28 -04:00
Uiri
e8d6fb26e7 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-25 18:30:15 -04:00
Uiri
0b19b77b5f A fix for the image breaking if you don't change anything on the edit profile page but hit update profile instead of cancel 2010-09-25 17:34:13 -04: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
Tiago Bastos
5a4f40591d Added missing translations. 2010-09-25 11:25:45 -03:00
Uiri
356a1e46b2 it is fixed, I think 2010-09-25 09:50:29 -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
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
ilya
f38bcc9eb3 tiny change in view 2010-09-24 15:54:53 -07:00
ilya
e414558f79 passing the right things to the partial 2010-09-24 15:52:29 -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
hemanth
d4ad943699 Check on universe repository, if enabled or not. 2010-09-25 06:36:02 +08:00
hemanth
1add029421 Check for wget added 2010-09-25 06:36:02 +08:00
hemanth
d66eedaf00 Fixed a major issue with sudo user check\! 2010-09-25 06:36:01 +08:00
Daniele Di Sarli
8323e7dcb2 Added Italian translation 2010-09-25 06:35:43 +08:00
Raphael
3b4b4f4ed3 Add a couple things to gitignore 2010-09-24 15:35:18 -07:00
Raphael
be623a0c3a Merge branch 'master' into 1.9.2 2010-09-24 15:18:59 -07:00
Raphael
999d229225 Post photos in either 1.8.7 or 1.9.2 2010-09-24 15:18:30 -07:00
Raphael
004e659ee1 fix album posting 2010-09-24 15:10:49 -07:00
ilya
c7757a302c typo 2010-09-24 15:06:48 -07:00
ilya
ac9854596f fb_status partial rendered in public 2010-09-24 15:04:31 -07:00