Commit graph

4014 commits

Author SHA1 Message Date
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
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
danielvincent
b2f3074eb0 DG MS; scenario for importer spec 2010-10-11 17:00:42 -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
Volkan Unsal
73f06bb61b add devise.tr.yml 2010-10-11 15:09:43 -04: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
Raphael
fe360e386a Merge remote branch 'rmaskey/master' into search 2010-10-11 10:47:24 -07:00
Raphael
bd6a8a85e2 Add spec for full name searching 2010-10-11 10:46:40 -07:00
Raphael
978643be97 Merge remote branch 'leamas/orvar' 2010-10-11 10:25:35 -07:00
Raphael
8cf72441b4 Make intended behavior on hcard action clearer, return 404 on nonexistent person 2010-10-11 10:13:52 -07:00
Raphael
04d5271530 Merge remote branch 'crimer/master' 2010-10-11 10:03:09 -07:00
Raphael
9f877d7dc8 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-11 10:02:06 -07:00
danielvincent
884d7b7dd7 flash message should slide in 2010-10-10 23:13:03 -07:00
Volkan Unsal
6d00b2ca8a correct some spelling errors in Turkish translation 2010-10-10 23:49:36 -04:00
Volkan Unsal
c26c244185 remove tmproj file. 2010-10-10 23:24:39 -04:00
Volkan Unsal
35ad703a5b Merge branch 'master' of http://github.com/diaspora/diaspora 2010-10-10 23:09:19 -04:00
Volkan Unsal
633048fbed finished Turkish translation 2010-10-10 23:06:56 -04:00