Homec4science

Merge branch 'master' into phutil_tag

Authored by epriestley <git@epriestley.com> on Feb 7 2013, 17:08.

Description

Merge branch 'master' into phutil_tag

(Sync.)

Event Timeline

epriestley <git@epriestley.com> committed rPH11bb8db9705d: Merge branch 'master' into phutil_tag (authored by epriestley <git@epriestley.com>).Feb 7 2013, 17:08

Merged Changes

CommitAuthorDetailsCommitted
3ce3f5d36803Lauri-Henrik Jalonen/epriestley
Drafts are saved as inline comments for images when user comments mock 
Feb 7 2013
431e2bee6e7cindiefan/epriestley
First (rough) pass at campfire protocol adapter for bot. 
Feb 7 2013
4004621d76beepriestley
Make Pholio selection reticle prettier 
Feb 7 2013
5b39bbe71b20epriestley
Batch Conpherence access to markup cache 
Feb 7 2013
68814d4ecab0Bob Trahan
add conpherence schema patch to the list so it runs 
Feb 7 2013
6a23cc1677f5Bob Trahan
fix derp from rP84efcb86698a00f863dbdb4cbd4c149c96e498dc i missed 
Feb 6 2013
1cde41b9946cBob Trahan
Conpherence - add crop 
Feb 6 2013
fb7d5d17a2beEdward Speyer
Don't do image stuff with unviewable images 
Feb 6 2013
361ce491f201epriestley
Make file storage more testable 
Feb 6 2013
e518135dfb54epriestley
Improve STRICT_ALL_TABLES warning 
Feb 6 2013
84efcb86698aepriestley
Minor, fix an issue with PhabricatorMenuView and default null keys. 
Feb 6 2013
57c001f52244Lauri-Henrik Jalonen/epriestley
Select portions from mock 
Feb 6 2013
1188876ea92fToby Hughes/epriestley
Fix exception in OAuthServerAuthController 
Feb 6 2013
f912fa1ab799epriestley
Minor, fix celerity map. 
Feb 6 2013
24ced7e7bd79epriestley
Expose commit information via conduit instead of user information 
Feb 6 2013
574bc3ba31ccindiefan/epriestley
First pass at decoupling Phabricator bot behavior from the protocol it's… 
Feb 6 2013
cb38ab27ce8aBob Trahan
fix find / replace error from addressing feedback in D4708. now links to tasks… 
Feb 5 2013
1d0058abcf24Bob Trahan
Update PeopleMenu to only show integration with applications if they are… 
Feb 5 2013
34b6c32d2eb5Bob Trahan
fix conpherence menu selection 
Feb 5 2013