danielvincent
|
0315869a24
|
all specs should pass again after merge
|
2010-10-13 09:43:58 -07:00 |
|
danielvincent
|
59c3be41b3
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-13 09:21:27 -07:00 |
|
Shawn McGuire
|
eaef6bdf04
|
Issue #272 Fixed color contrast
|
2010-10-13 11:12:27 -05:00 |
|
Alec Leamas
|
ccdc259838
|
Comment update
|
2010-10-13 12:50:29 +02:00 |
|
Alec Leamas
|
7e1dea26b0
|
Merge branches 'master' and 'port-test'
|
2010-10-13 12:48:14 +02:00 |
|
Alec Leamas
|
d3a6031f88
|
Merge remote branch 'upstream/master' into port-test
|
2010-10-13 12:47:49 +02:00 |
|
Alec Leamas
|
49975d7010
|
Providing better message if port 3000 is in use, closing ticket 287.
|
2010-10-13 12:26:52 +02:00 |
|
Alec Leamas
|
8c2ccfc5a8
|
Updating to reflect new tests on 10.04 desktop.
|
2010-10-13 10:34:32 +02:00 |
|
Alec Leamas
|
2ffff53d2e
|
Merge branch 'ubuntu'
|
2010-10-13 10:27:37 +02:00 |
|
Alec Leamas
|
ea185ccf6a
|
Resolving merge conflict... My bad, apologies
|
2010-10-13 10:23:06 +02:00 |
|
Alec Leamas
|
747c95515e
|
Merge remote branch 'upstream/master' into ubuntu
|
2010-10-13 10:01:56 +02:00 |
|
ilya
|
add350ce16
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-13 00:19:29 -07:00 |
|
Alec Leamas
|
e922a3be5c
|
Ubuntu 10.10 desktop fixes
|
2010-10-13 08:29:24 +02:00 |
|
Sarah Mei
|
56c6688c81
|
Take out reloads so specs run on 1.9.2
|
2010-10-12 20:54:00 -07:00 |
|
Sarah Mei
|
da9819e0fa
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 19:09:28 -07:00 |
|
Sarah Mei
|
bbf396be42
|
Remove Gemfile.lock before each bundle install
|
2010-10-12 19:08:50 -07:00 |
|
danielvincent
|
7ea3fe5bf1
|
MS DG; verifys implemented, but need more tests
|
2010-10-12 18:53:12 -07:00 |
|
ilya
|
db1a01d51b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 18:24:20 -07:00 |
|
ilya
|
324f14c719
|
setting the token to nil on accept of invite
|
2010-10-12 18:23:59 -07:00 |
|
Raphael
|
3b82001a42
|
Step down font size 1px in info
|
2010-10-12 18:19:31 -07:00 |
|
Raphael
|
fe0120cc0d
|
Return everyone on an empty search
|
2010-10-12 18:18:03 -07:00 |
|
danielvincent
|
92e5622247
|
DG MS; adding verification methods to importer.
|
2010-10-12 17:41:09 -07:00 |
|
Alec Leamas
|
2a153316ce
|
Not used
|
2010-10-13 01:41:28 +02:00 |
|
Alec Leamas
|
6f2f9afe56
|
Merge remote branch 'upstream/master'
|
2010-10-13 01:10:13 +02:00 |
|
ilya
|
9b249281a1
|
moved verify comment sig before any saving goes on
|
2010-10-12 16:01:36 -07:00 |
|
ilya
|
b53462ee93
|
Merge branch 'malicious_friend_refactor' of github.com:diaspora/diaspora
|
2010-10-12 15:55:02 -07:00 |
|
ilya
|
c00a70dde1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 15:54:37 -07:00 |
|
danielvincent
|
8915eca3d5
|
DG MS; testing that posts actually get serialized into an array.
|
2010-10-12 15:39:52 -07:00 |
|
Alec Leamas
|
c818885b6e
|
Fixes after more tests
|
2010-10-13 00:35:50 +02:00 |
|
danielvincent
|
8720dfa950
|
DG MS; made test slower. posts now export correctly.
|
2010-10-12 15:33:08 -07:00 |
|
ilya
|
0896052b80
|
remote comment spec, which passed surprisingly, the comment contains the person
|
2010-10-12 15:31:54 -07:00 |
|
Raphael
|
900a085124
|
Merging in bigbash's fixes
|
2010-10-12 15:09:32 -07:00 |
|
Shawn McGuire
|
b548520591
|
Changed div.info color and font size to be larger and darker
Issue #285
|
2010-10-12 16:42:03 -05:00 |
|
Shawn McGuire
|
ca571432c2
|
Changed remaining http:// to git://
|
2010-10-12 16:28:42 -05:00 |
|
Alec Leamas
|
00bcfaf345
|
Check for universe enabled in diaspora-install-deps
|
2010-10-12 23:10:29 +02:00 |
|
Alec Leamas
|
fac7629610
|
Minor bugfixes, discovered after checking in ubuntu stuff.
|
2010-10-12 23:10:08 +02:00 |
|
Alec Leamas
|
5bc174da15
|
Well, another gitignore ;)
|
2010-10-12 21:24:21 +02:00 |
|
Alec Leamas
|
6177362c4a
|
Adding the ubuntu install package, initial version.
T
|
2010-10-12 21:22:49 +02:00 |
|
ilya
|
d8439c82ee
|
going calling by webfinger only once
|
2010-10-12 12:21:57 -07:00 |
|
danielvincent
|
1d1ff7e330
|
Merge branch 'master' of github.com:diaspora/diaspora into import
|
2010-10-12 11:34:31 -07:00 |
|
danielvincent
|
2e8bba1a04
|
MS DG adding more to exporter and importer
|
2010-10-12 11:34:13 -07:00 |
|
ilya
|
a068ee532d
|
almost all green
|
2010-10-12 11:17:29 -07:00 |
|
Raphael
|
1fcf45dab9
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-12 10:55:30 -07:00 |
|
Raphael
|
19b5fb0b84
|
Delete instead of destroy to simulate a remote user
|
2010-10-12 10:55:19 -07:00 |
|
ilya
|
a955dd308e
|
user_friending_spec green, did a slight refactor need more
|
2010-10-12 10:25:43 -07:00 |
|
Sarah Mei
|
546401cbec
|
Gemfile.lock is different in 1.9.2, so we need to remove it after running specs so the next pull succeeds.
|
2010-10-11 22:37:58 -07:00 |
|
Sarah Mei
|
e3e76ec3e0
|
correct permissions on bash script for CI
|
2010-10-11 22:33:44 -07:00 |
|
Sarah Mei
|
2d57b5dc9a
|
bash script to run specs against multiple versions of Ruby on CI
|
2010-10-11 22:24:48 -07:00 |
|
ilya
|
ee2d134cb0
|
receiving spec is green
|
2010-10-11 19:20:00 -07:00 |
|
danielvincent
|
948c5d9b02
|
DG MS; end of day.
|
2010-10-11 19:04:27 -07:00 |
|