Commit graph

41 commits

Author SHA1 Message Date
maxwell
ec05c21472 profile now knows about three images sizes, even in federation case 2010-11-30 13:40:41 -08:00
Raphael
a85f47041a This file is generated by rake fixtures:users 2010-11-24 14:07:00 -05:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
maxwell
709e348457 Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
	spec/fixtures/users.yaml
2010-11-23 00:15:26 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
maxwell
7c09117230 fixing build 2010-11-22 19:05:35 -08:00
maxwell
173ec5f73b Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
This reverts commit c45893d07d.

Conflicts:

	config/locales/diaspora/en.yml
2010-11-22 17:11:34 -08:00
maxwell
c45893d07d remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar 2010-11-22 16:38:10 -08:00
Sarah Mei
218aa1c0d6 MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent 2010-11-21 19:56:35 -08:00
danielvincent
bd0c21a634 button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test. 2010-11-21 16:30:46 -08:00
zhitomirskiyi
c2dcf9a074 fixed the invite spec 2010-11-18 16:55:44 -08:00
maxwell
747ab761a0 pushing mailer spec for ilya 2010-11-18 15:36:30 -08:00
maxwell
2ffd2d93e3 made mailchimp form ssl 2010-11-17 23:19:12 -08:00
maxwell
f01fca1877 letting jammit do its default thing 2010-11-17 22:18:15 -08:00
danielvincent
1a9041a3c0 DG MS; fixed cucumber tests to work with new landing page flow 2010-11-17 19:49:01 -08:00
maxwell
2c627cdb2b updating jas 2010-11-17 00:16:11 -08:00
Sarah Mei
44bd4534ce I found where we needed the one-line addition. Ruby 1.9 build now works.
I feel pretty badass.
2010-11-15 22:44:55 -08:00
Sarah Mei
686cea6595 1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9. 2010-11-15 21:52:02 -08:00
Sarah Mei
9fa47c9bfa Fix a failing spec under 1.9 in receive_spec 2010-11-15 21:19:21 -08:00
Sarah Mei
23c1ac4936 Cucumber feature for managing contact requests 2010-11-14 21:49:56 -08:00
Sarah Mei
830a43ec2f Add destroy specs for RequestsController.
Cucumber feature for contact requests.
2010-11-14 09:43:28 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
danielvincent
da8124f8a7 hcard has searchable field, and is taken in to account when building Person from webfinger 2010-11-02 16:12:43 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
Raphael
5b78a31d29 make_user now makes a user from fixtures 2010-10-29 15:53:21 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05:17 -07:00
maxwell
b17ae0bf38 DG MS removed unused fb_status model and respective specs, fixtures. 2010-10-25 12:26:08 -07:00
maxwell
27bbbafe04 updated the hcard fixture, because the old one is not actually representive of what we are using 2010-10-16 11:16:33 -07:00
ilya
08b9aa864a Merge branch 'master' of github.com:diaspora/diaspora into fb
Conflicts:
	app/views/layouts/application.html.haml
	app/views/shared/_publisher.haml
	app/views/shared/_sub_header.haml
	app/views/users/edit.html.haml
	config/deploy_config.yml
	config/routes.rb
2010-09-27 15:39:50 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
ilya
bb58678556 added a fb_status model & parser method 2010-09-24 14:41:31 -07:00
maxwell
84c60e5f2e DG MS fixing webfinger, i hope to goodness 2010-09-15 13:28:06 -07:00
ilya
0560b46080 MS IZ added friend redirect, and moved the webfinger responces to fixture directory 2010-09-14 11:58:40 -07:00
Raphael
39c96bfd04 Changing to a smaller pic in the tests 2010-08-18 16:00:06 -07:00
Raphael
58addca8dd RS, IZ; extracted and murdered ostatus. 2010-08-04 16:00:01 -07:00
maxwell
1118b56bb1 DG MS we now fully parse an ostatus response 2010-07-22 16:55:28 -07:00
maxwell
9b1fcdbab2 MS DG some serious message handler and user request API stuff....needs way more tests 2010-07-21 20:33:43 -07:00
Raphael
9165ac413a image uploading started 2010-07-16 12:31:24 -07:00
ilya
b9146cbb41 RS IZ; now signatures work like in real life 2010-07-12 20:42:22 -07:00
ilya
406c00aeb6 RS IZ; using detached signatures and verification things 2010-07-12 18:31:20 -07:00