Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for importing from Google Docs #75

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Add support for importing from Google Docs #75

wants to merge 14 commits into from

Commits on Oct 16, 2013

  1. stub

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    ad07bef View commit details
    Browse the repository at this point in the history

  2. first attempt to get gdoc importer into the Add drop down

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    7f66b09 View commit details
    Browse the repository at this point in the history

  3. stype google doc import drop down item

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    746a83f View commit details
    Browse the repository at this point in the history

  4. namespace-ified google's js API

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    e36682a View commit details
    Browse the repository at this point in the history

  5. call gdoc2html service and get back html

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    03e7b11 View commit details
    Browse the repository at this point in the history

  6. got _loadComplex() plumbing to work. imported html is diplayed in the… 

    … editable area. woo hoo.
    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    b465bfd View commit details
    Browse the repository at this point in the history

  7. futz with this

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    35f80dd View commit details
    Browse the repository at this point in the history

  8. made some but not of phil's suggested changes

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    d4dce81 View commit details
    Browse the repository at this point in the history

  9. reworked the promise nest using jquery 1.8 then()s.

    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    cd905e2 View commit details
    Browse the repository at this point in the history

  10. moving console messages out of the promise nest, which now looks much… 

    … cleaner. commented out alerts.
    @bnwest @izak
    bnwest authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    d1ab8d6 View commit details
    Browse the repository at this point in the history

  11. clean up code

    @philschatz @izak
    philschatz authored and izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    4c1a434 View commit details
    Browse the repository at this point in the history

  12. Fix breakage when context model is null.

    @izak
    izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    2a613ef View commit details
    Browse the repository at this point in the history

  13. Distinguish between pickerbuilder and picker correctly.

    @izak
    izak committed Oct 16, 2013
    Configuration menu
    Copy the full SHA
    9905470 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2013

  1. Merge branch 'master' into izak-gdocs-refactor 

    Conflicts:
	scripts/controllers/routing.coffee
    @izak
    izak committed Nov 4, 2013
    Configuration menu
    Copy the full SHA
    40eb482 View commit details
    Browse the repository at this point in the history