Commit graph

3849 commits

Author SHA1 Message Date
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
maxwell
26e1cfe955 MS RS actually fix the photo bug. without breaking the specs 2010-11-08 14:26:43 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Raphael
38a1b948ed Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 11:38:49 -08:00
Raphael
15b3ed14dd public git submodule 2010-11-08 11:26:01 -08:00
maxwell
3bb75d925f Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 11:13:54 -08:00
Raphael
f4e8e619ca Install open-ssl-devel 2010-11-08 11:10:35 -08:00
maxwell
7e40558dc4 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:33:05 -08:00
maxwell
e5c2bb46f5 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:30:01 -08:00
maxwell
80c8451bf2 fixing translation text of services page 2010-11-08 10:25:11 -08:00
maxwell
7ca6677b33 making publisher submit button have a higher zindex 2010-11-08 10:18:00 -08:00
maxwell
0d26348e69 remove arnold from the inviter mail form 2010-11-08 10:05:34 -08:00
maxwell
5b2f800e6c Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 10:00:54 -08:00
Alec Leamas
4667774da1 Adding pkg submodule = diaspora-packages repo
Use' git submodule update --init pkg' to populate.
2010-11-08 18:09:50 +01:00
maxwell
6c02614496 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 01:27:02 -08:00
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