Commit graph

4084 commits

Author SHA1 Message Date
maxwell
21cdbf08b5 we need to ask to publish on peoples wall...this was working because we all installed it with minifb which asked for everything 2010-11-08 01:26:11 -08:00
Sarah Mei
1a4fa2713a More specs for aspect-edit.js. Initialize now fully covered.
Also, bundler upgraded our cucumber and rspec.
2010-11-07 16:58:51 -08:00
danielvincent
d7172767ba moved fancybox assets to vendor/css 2010-11-07 12:24:54 -08:00
danielvincent
58ce81f674 Add a person to aspect contains a searchable list as opposed to a dropdown. 2010-11-07 12:20:33 -08:00
danielvincent
0127c9eb6f people on manage page are draggable again. took out jquery.cycle. fixed loading issue with tipsy.gif 2010-11-07 11:07:37 -08:00
danielvincent
a4df6a8a53 bugfix in peeople#_person partial displaying relationship status 2010-11-07 10:51:33 -08:00
danielvincent
f594fa1d80 Stream is its own partial, which takes a collection of posts 2010-11-07 10:38:00 -08:00
Sarah Mei
32d953f457 Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor. 2010-11-06 16:50:07 -07:00
maxwell
a971985884 removed private info if you are not friends 2010-11-06 16:34:41 -07:00
Michael Sofaer
3876de9cf2 Set the secret token 2010-11-06 13:57:06 -07:00
Michael Sofaer
cf7b957b28 Open port 80 2010-11-06 12:12:33 -07:00
danielvincent
020cd90341 aspect labels on people#show view 2010-11-06 11:09:11 -07:00
danielvincent
ecfcc96f8e Post a message to aspect dialog will only display if people are present. 2010-11-05 21:14:00 -07:00
Raphael
8023b6f344 Check for birthday before putting in birthday paramaters 2010-11-05 18:32:18 -07:00
danielvincent
58c3a4306f fixed the build 2010-11-05 18:16:28 -07:00
Raphael
a6c5c08a9f log to log 2010-11-05 17:55:00 -07:00
danielvincent
ddb4b2b6ee Clicking 'make public' label on everyone publisher selects respective checkbox 2010-11-05 17:49:15 -07:00
maxwell
32ed7e3b0f forgot to add the birthday picker change in the previous commit. now getting started does not prompt you to look for photos you dont have 2010-11-05 17:48:33 -07:00
maxwell
1a642e044a Merge branch 'master' of github.com:diaspora/diaspora 2010-11-05 17:43:30 -07:00
danielvincent
1a481d43d2 Use _stream_element.haml as a wrapper for posts in the stream. 2010-11-05 17:40:28 -07:00
maxwell
4a39d1a516 date now has a default nil value 2010-11-05 17:38:51 -07:00
danielvincent
9a055b6cba Photo partial now has a description and a link to view all photos by that person. 2010-11-05 17:27:36 -07:00
maxwell
e4f8f558a0 aspects now have a max length of 20 characters 2010-11-05 17:18:20 -07:00
maxwell
4300b20c34 cleaned up profile page a bit more 2010-11-05 14:28:39 -07:00
danielvincent
3ed10a22ff xml_accessor creates attr_accessors in addition to xml_readers 2010-11-05 14:25:45 -07:00
Raphael
6468f0003b Take out some xml accessors 2010-11-05 14:24:56 -07:00
danielvincent
bd9aa90278 User receives notification on new comment on post on any page. 2010-11-05 14:18:22 -07:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07:00
maxwell
cc92f61583 mailer queue now works 2010-11-05 11:58:25 -07:00
maxwell
42c24e2b04 more testing 2010-11-05 11:46:43 -07:00
maxwell
53b25728ce yay for typo 2010-11-05 11:46:43 -07:00
maxwell
4154cec28a made mailer query based on ids, rather than making them serialize ruby objects 2010-11-05 11:46:43 -07:00
maxwell
363f76aed9 removing mail worker 2010-11-05 11:46:43 -07:00
maxwell
fef8ee5de3 adding scripts 2010-11-05 11:46:43 -07:00
zhitomirskiyi
d793bdc3c7 inital commit for mailqueue 2010-11-05 11:46:43 -07:00
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Raphael
c69e2b8900 rename spec file 2010-11-05 11:26:49 -07:00
Raphael
4233e45bc5 Adjust wording 2010-11-05 11:23:21 -07:00
maxwell
997f9ad8d0 making profile not look so bad 2010-11-05 00:54:09 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered.
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
2010-11-04 22:51:30 -07:00
Sarah Mei
a230763879 gender is a text field 2010-11-04 22:02:27 -07:00
Raphael
1bba4c60f7 Merge remote branch 'MrZYX/untranslated-strings'
Conflicts:
	app/views/aspects/manage.html.haml
	config/locales/diaspora/en.yml
2010-11-04 20:05:57 -07:00
Raphael
061ec59091 Merge remote branch 'jdeisenberg/511-nonstandard-mongo-port' 2010-11-04 19:55:09 -07:00
Derrick Camerino
087f7e90d4 removing aspect in ui only if ok is clicked on confirmation 2010-11-04 19:54:11 -07:00
Michael Sofaer
7cb034ec9d Start the thin and the websocket server with dt 2010-11-04 19:49:52 -07:00
Michael Sofaer
3bb6ab5545 Harden Ruby again. This needs a serious refactor. 2010-11-04 19:49:01 -07:00
Raphael
aac9080299 smells like... greenery 2010-11-04 19:45:23 -07:00
Raphael
abebd18c98 Move getting_started self link color to a css class 2010-11-04 19:29:15 -07:00
Raphael
c1c631d5ed Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
Conflicts:
	config/locales/diaspora/en.yml
2010-11-04 18:56:43 -07:00