Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jhollingworth/bootstrap-wysihtml5
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: trantorLiu/bootstrap-wysihtml5
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: file-upload
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 5 commits
  • 7 files changed
  • 1 contributor

Commits on Jul 17, 2013

  1. File upload support. 

    When `options.fileUpload` is provided, there will be an additional file input field in the insert image modal.
Whenever a file is uploaded, it **alt** or **src** will be append to the modal.
    @trantorLiu
    trantorLiu committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    83d97c9 View commit details
    Browse the repository at this point in the history

  2. Add file-upload section to readme.

    @trantorLiu
    trantorLiu committed Jul 17, 2013
    Configuration menu
    Copy the full SHA
    e7e9cce View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2013

  1. Issue #1 - Set the drag & drop zone to the entire modal. 

    I added a sentence `locale.en.image.usage`. Other language supports should be added.
    @trantorLiu
    trantorLiu committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    01308f9 View commit details
    Browse the repository at this point in the history

  2. Fixed the bug that after inserting images, the .uploaded section is… 

    … not reset.
    @trantorLiu
    trantorLiu committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    a9ae665 View commit details
    Browse the repository at this point in the history

  3. Chinese support on issue #1.

    @trantorLiu
    trantorLiu committed Jul 19, 2013
    Configuration menu
    Copy the full SHA
    fad8193 View commit details
    Browse the repository at this point in the history
Loading