Commit graph

2838 commits

Author SHA1 Message Date
Raphael
f09a54b67f Revert "arguments..."
This reverts commit 8049aa20e8.
2010-10-08 16:08:25 -07:00
Raphael
8049aa20e8 arguments... 2010-10-08 16:01:24 -07:00
ilya
8e61b438ab setting the username 2010-10-08 16:00:58 -07:00
Raphael
6cbe4075f4 CGI unescape incoming salmons 2010-10-08 15:59:32 -07:00
Raphael
a720694364 Make logging less verbose 2010-10-08 15:51:12 -07:00
Raphael
b7116ca413 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 15:47:43 -07:00
Raphael
b7bf526b91 Make logging message clearer 2010-10-08 15:47:30 -07:00
danielvincent
9ac13ccb3e fixed reshare a bit 2010-10-08 15:47:06 -07:00
ilya
ef3e627bed the users are now made with people 2010-10-08 15:40:42 -07:00
danielvincent
edd8f0ba6d links now have active state 2010-10-08 15:35:22 -07:00
danielvincent
086df28a37 removed connected to facebook text under everyone publisher 2010-10-08 15:21:27 -07:00
maxwell
255901dfab fixing copypasta 2010-10-08 15:00:04 -07:00
maxwell
d7521cb288 MS trying to not use MiniFB to post since it is barfing 2010-10-08 14:49:09 -07:00
Raphael
b613361855 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:47:10 -07:00
Raphael
3729431ccf don't translate css class to mark request count 2010-10-08 14:46:57 -07:00
danielvincent
44338a9897 removed traces of :public 2010-10-08 14:44:56 -07:00
Raphael
6064b2e022 Add a spec, move another to posting 2010-10-08 14:37:22 -07:00
maxwell
293ccdf3e4 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:25:53 -07:00
maxwell
b6b192da01 MS DG trying to move around fb url 2010-10-08 14:25:39 -07:00
Sarah Mei
5862952a40 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 15:22:15 -06:00
Sarah Mei
bc75c4acf5 Let's try putting display in the rake command. 2010-10-08 15:22:02 -06:00
danielvincent
526fbe9a90 fixed error where publisher would cause status_message_controller to error out 2010-10-08 14:19:54 -07:00
danielvincent
7d96c95caf fixed breaking aspect show pages 2010-10-08 14:15:35 -07:00
danielvincent
48e92c2c33 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:07:05 -07:00
danielvincent
154ec95717 killed the public tab. made a broadcast button in everyone tab 2010-10-08 14:06:49 -07:00
Sarah Mei
4e3e6d9562 rake task starts a virtual framebuffer before running tests, stops it after 2010-10-08 14:55:53 -06:00
Sarah Mei
ebef212079 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 14:14:48 -06:00
Sarah Mei
564217684f Fail CI if exitstatus isn't 0. *sigh* 2010-10-08 14:14:39 -06:00
Raphael
662492b8e6 Merge remote branch 'crimer/master' 2010-10-08 13:12:50 -07:00
Crimer
3754b519a7 Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'. 2010-10-08 21:51:59 +00:00
Raphael
76e77c2bf1 refactor hcard for faster testing 2010-10-08 13:06:21 -07:00
danielvincent
d13f8e12c8 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 12:26:15 -07:00
danielvincent
a3aab92212 fixed photo partial 2010-10-08 12:25:42 -07:00
Raphael
e18466e4fa Merge remote branch 'nickvdb/master' 2010-10-08 10:56:48 -07:00
Raphael
9c9fe7042d Merge remote branch 'leamas/fedora-pkg' 2010-10-08 10:55:46 -07:00
danielvincent
b70cf713ec removed old pending spec 2010-10-08 09:16:11 -07:00
Alec Leamas
8b190eb1b4 Updating spec files to new versions, make-dist.sh update, some typos. 2010-10-08 18:12:24 +02:00
Alec Leamas
40dabffacc Formatting & comments 2010-10-08 12:15:30 +02:00
Alec Leamas
93a43e09b7 A bunch of typos & such 2010-10-08 12:00:26 +02:00
Sarah Mei
4a88ac22c2 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 02:15:17 -06:00
Sarah Mei
899d82b766 Fix 1 of 2 pending photo specs. 2010-10-08 02:15:07 -06:00
danielvincent
4bb26cfce4 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 00:46:41 -07:00
danielvincent
fab9e8b6eb cleaned request spec 2010-10-08 00:46:24 -07:00
Sarah Mei
36c6043e8e Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 01:42:58 -06:00
Sarah Mei
ce9aa3600d Refactor user friending spec 2010-10-08 01:42:48 -06:00
danielvincent
fc2eda7adf Merge branch 'master' of github.com:diaspora/diaspora 2010-10-08 00:37:10 -07:00
danielvincent
3a876770f3 minor tweaks 2010-10-08 00:36:55 -07:00
Sarah Mei
511cd8fa1c Clean up reloading in user friending spec. 2010-10-08 01:23:33 -06:00
Nick van der Burgt
09b38bb726 Added dutch locale 2010-10-08 09:11:04 +02:00
Sarah Mei
b02e266130 Don't need a bundle install in the ci task 2010-10-08 01:07:07 -06:00