Alec Leamas
|
ea185ccf6a
|
Resolving merge conflict... My bad, apologies
|
2010-10-13 10:23:06 +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 |
|
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 |
|
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 |
|
Alec Leamas
|
c818885b6e
|
Fixes after more tests
|
2010-10-13 00:35:50 +02: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 |
|
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 |
|
Raphael
|
b370f4c560
|
adjust readme
|
2010-10-11 18:41:09 -07:00 |
|
ilya
|
03df0ff716
|
parser spec is green
|
2010-10-11 18:22:19 -07:00 |
|
Raphael
|
c8f864a69b
|
Finish fixing move_private_key
|
2010-10-11 17:22:53 -07:00 |
|
Raphael
|
a372ec33be
|
fixing uninitialized constant in rake task
|
2010-10-11 16:36:34 -07:00 |
|
Raphael
|
be8b16c5cb
|
### looks bad
|
2010-10-11 16:32:28 -07:00 |
|
Raphael
|
bfc20978ff
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 16:01:30 -07:00 |
|
Raphael
|
674fbc050b
|
Some readme modifications
|
2010-10-11 16:01:16 -07:00 |
|
ilya
|
d6b08de6fc
|
corrected link on the account page
|
2010-10-11 15:07:17 -07:00 |
|
ilya
|
bb7e2a9918
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 14:58:22 -07:00 |
|
ilya
|
007f6cfb6f
|
close account
|
2010-10-11 14:58:11 -07:00 |
|
danielvincent
|
be017bfb0a
|
DG MS; invite is now a lightbox on feed and manage pages
|
2010-10-11 14:16:24 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
danielvincent
|
b3d9884e0d
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 11:38:26 -07:00 |
|
danielvincent
|
0f7807222b
|
DG MS; cleaned up method
|
2010-10-11 11:38:08 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -07:00 |
|
Raphael
|
80d7a755b8
|
Add links to issue tracker
|
2010-10-11 11:27:10 -07:00 |
|
Raphael
|
82e6e29e37
|
A small readme change
|
2010-10-11 11:22:26 -07:00 |
|
Raphael
|
09c6af28a4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 11:09:35 -07:00 |
|
Raphael
|
73e4d2b25b
|
Pull in search improvement, remove cruft
|
2010-10-11 11:08:54 -07:00 |
|
danielvincent
|
c630d3db6f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 10:53:18 -07:00 |
|
danielvincent
|
82f526ea23
|
DG MS; added tooltip
|
2010-10-11 10:53:00 -07:00 |
|