Alec Leamas
|
164cc7e6f6
|
testing
|
2010-10-23 05:39:56 +02:00 |
|
Alec Leamas
|
c28da31f61
|
testing
|
2010-10-23 04:50:04 +02:00 |
|
Alec Leamas
|
1bb046dd1e
|
testing
|
2010-10-23 04:32:29 +02:00 |
|
Alec Leamas
|
79aa1f34a6
|
test
|
2010-10-22 22:30:53 +02:00 |
|
Alec Leamas
|
97cdc12681
|
test
|
2010-10-22 17:38:19 +02:00 |
|
Alec Leamas
|
557142d809
|
testing
|
2010-10-22 17:19:06 +02:00 |
|
Alec Leamas
|
c55341632e
|
bugfix
|
2010-10-22 15:52:56 +02:00 |
|
Alec Leamas
|
92ab2b277e
|
bugfix
|
2010-10-22 15:28:29 +02:00 |
|
Alec Leamas
|
f697064cb6
|
bugfix
|
2010-10-22 13:49:38 +02:00 |
|
Alec Leamas
|
70e1d2de53
|
bugfixes
|
2010-10-22 12:49:11 +02:00 |
|
Alec Leamas
|
e9ce7614bd
|
bugfix
|
2010-10-22 11:35:11 +02:00 |
|
Alec Leamas
|
830277c67a
|
Merge branch 'v2'
Conflicts:
pkg/fedora/diaspora-bundle.spec
|
2010-10-22 09:25:17 +02:00 |
|
Alec Leamas
|
56eeae464e
|
Merging
|
2010-10-22 09:21:49 +02:00 |
|
Alec Leamas
|
d5e8e516aa
|
First try on ubuntu
|
2010-10-22 09:19:10 +02:00 |
|
Raphael
|
645685a8fb
|
Make flash notice CSS less deadly
|
2010-10-21 23:18:53 -07:00 |
|
Alec Leamas
|
19c0f50f78
|
Creates a working diaspora-bundle.rpm
|
2010-10-22 05:49:07 +02:00 |
|
ilya
|
9375bb6408
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-21 16:07:49 -07:00 |
|
ilya
|
e677e4782e
|
the handle is now in the email if only one user invited the person
|
2010-10-21 16:07:31 -07:00 |
|
Raphael
|
41cfd36b19
|
Refactor user_spec a little
|
2010-10-21 16:06:47 -07:00 |
|
Raphael
|
fe1a6bce20
|
Attr-accessible on aspects, check whether built user is persisted
|
2010-10-21 12:49:50 -07:00 |
|
Alec Leamas
|
7d2c426d20
|
makes a bundle app can't find
|
2010-10-21 21:10:53 +02:00 |
|
Raphael
|
705cef3696
|
Fix comment spec
|
2010-10-21 10:55:17 -07:00 |
|
Raphael
|
35a830aa03
|
Fix profile update spec
|
2010-10-21 10:39:19 -07:00 |
|
Raphael
|
c58b4706a5
|
Update carrierwave in Gemfile.lock
|
2010-10-21 10:09:52 -07:00 |
|
Sarah Mei
|
e414b1c553
|
Fix some comment specs (still one failing). Remove warning from receive spec.
|
2010-10-21 06:45:15 -07:00 |
|
Alec Leamas
|
c4b6ec4dd6
|
generates a RPM!
|
2010-10-21 13:59:08 +02:00 |
|
Alec Leamas
|
c0c45fa074
|
First try: the bundle looks OK.
|
2010-10-21 10:34:44 +02:00 |
|
danielvincent
|
06e2b43516
|
252,252,252 rgb for body background. you won't even notice.
|
2010-10-20 23:46:24 -07:00 |
|
danielvincent
|
8e175be2ba
|
fixed comments not showing up through websocket on photo show page
|
2010-10-20 23:40:48 -07:00 |
|
Sarah Mei
|
82e947a74a
|
Disabling ruby 1.9 build until we can move off capybara
|
2010-10-20 22:44:18 -07:00 |
|
Sarah Mei
|
2bab775973
|
ci.sh uses @diaspora gemset and forces removal of Gemfile.lock
|
2010-10-20 22:37:50 -07:00 |
|
Sarah Mei
|
d98b551464
|
Let's try something a little simpler.
|
2010-10-20 22:22:34 -07:00 |
|
Sarah Mei
|
48c13d81c5
|
rly rly remove Gemfile.lock. rly!
|
2010-10-20 21:56:59 -07:00 |
|
Sarah Mei
|
e5f1975dcf
|
Remove Gemfile.lock before doing rake cruise
|
2010-10-20 21:54:33 -07:00 |
|
Sarah Mei
|
669a7cabb2
|
Use diaspora gemset. Simplify rake runner.
|
2010-10-20 21:43:03 -07:00 |
|
Sarah Mei
|
29dd5bc727
|
Let's actually use rvm this time.
|
2010-10-20 21:25:16 -07:00 |
|
Sarah Mei
|
ddc24e1c47
|
Duh. rvm doesn't want sudo.
|
2010-10-20 21:21:55 -07:00 |
|
Sarah Mei
|
55914827db
|
cruisecontrol uses rvm
|
2010-10-20 21:06:33 -07:00 |
|
Alec Leamas
|
fe51da9d32
|
Merge branches 'v2' and 'master'
|
2010-10-21 05:58:20 +02:00 |
|
Alec Leamas
|
33aac53844
|
VERY provisionary fix to get tests running.
|
2010-10-21 05:56:07 +02:00 |
|
Sarah Mei
|
560910b53d
|
More cruisecontrol bits
|
2010-10-20 20:47:07 -07:00 |
|
Sarah Mei
|
707952797b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 20:39:38 -07:00 |
|
Sarah Mei
|
73f0e17f5a
|
Converting to cruisecontrol.rb
|
2010-10-20 20:39:13 -07:00 |
|
Alec Leamas
|
a0fc7c9a54
|
Merge remote branch 'upstream/master'
|
2010-10-21 05:37:25 +02:00 |
|
Alec Leamas
|
02535e286b
|
Merge branch 'fixes'
|
2010-10-21 05:36:35 +02:00 |
|
Alec Leamas
|
a89e4b2ae5
|
missing file(s)
|
2010-10-21 05:35:02 +02:00 |
|
ilya
|
84e19f833a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 18:30:36 -07:00 |
|
ilya
|
30bae4f807
|
throws an alert if you try to remove person from the last aspect
|
2010-10-20 18:30:22 -07:00 |
|
maxwell
|
36a5fe6b31
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-20 18:24:15 -07:00 |
|
maxwell
|
494a0e2d3f
|
updating the db script for dev to set the default pictures
|
2010-10-20 18:24:09 -07:00 |
|