Permalink
Commits on May 15, 2014
  1. Merge pull request #1331 from jmeas/updated-descriptions

    Updated Controller description
    samccone committed May 15, 2014
  2. Updated Controller description

    jmeas committed May 15, 2014
Commits on May 8, 2014
  1. Bump and build v1.8.5

    samccone committed May 8, 2014
Commits on May 7, 2014
Commits on May 6, 2014
  1. Merge pull request #1293 from bzalasky/patch-3

    Did a quick editing pass
    samccone committed May 6, 2014
  2. Did a quick editing pass

    A couple of comma's that should be there, and chopping a wordy sentence down to an adverb. I promise I'll make some non doc/grammar contributions soon. I've been using Marionette for 2+ years now, and would like give back to the project that's given me so much.
    bzalasky committed May 6, 2014
Commits on May 2, 2014
  1. Merge pull request #1282 from bzalasky/patch-2

    Update CONTRIBUTING.md
    samccone committed May 2, 2014
  2. Update CONTRIBUTING.md

    Couple more typos.
    bzalasky committed May 2, 2014
  3. Merge pull request #1281 from bzalasky/patch-1

    Update CONTRIBUTING.md
    samccone committed May 2, 2014
  4. Update CONTRIBUTING.md

    Missing 'a'.
    bzalasky committed May 2, 2014
  5. Merge pull request #1278 from therealjessesanford/master

    Should have been values not keys here
    samccone committed May 2, 2014
Commits on May 1, 2014
  1. Bump and build v1.8.4

    samccone committed May 1, 2014
  2. Merge pull request #1277 from thejameskyle/fix-behaviors-toc

    Fix behaviors doc ToC
    samccone committed May 1, 2014
  3. Fix behaviors doc ToC

    thejameskyle committed May 1, 2014
Commits on Apr 25, 2014
  1. Merge pull request #1235 from joezimjs/patch-3

    Fix Typo in Changelog
    samccone committed Apr 25, 2014
  2. Fix Typo in Changelog

    1.6.3 example showed a function returning an `events` hash when it should have been returning a `ui` hash.
    joezimjs committed Apr 25, 2014
Commits on Apr 24, 2014
  1. Merge pull request #1224 from ftdebugger/patch-1

    Update marionette.behaviors.md
    jmeas committed Apr 24, 2014
  2. bump and build v1.8.3

    samccone committed Apr 24, 2014
  3. Flesh out docs for CollectionView#getItemView

    Resolves #509
    eschwartz committed with samccone Apr 21, 2014
Commits on Apr 19, 2014
  1. Merge pull request #1204 from thejameskyle/remove-package-json-nonsense

    Remove Volo, Jam, and maintainers from package.json
    samccone committed Apr 19, 2014
Commits on Apr 18, 2014
  1. bump and build v1.8.2

    samccone committed Apr 18, 2014
Commits on Apr 17, 2014
  1. Merge pull request #1188 from marionettejs/sjs/fix-test-watch

    Fix the grunt dev watch to work more than once
    jmeas committed Apr 17, 2014
Commits on Apr 16, 2014
Commits on Apr 15, 2014
  1. bump and build for v1.8.1

    This release is to update the bower components to
    their latest version.
    samccone committed Apr 15, 2014
Commits on Apr 14, 2014
  1. Merge pull request #1163 from jmeas/fix-gruntfile-lint

    Adds lint alias task back to the Gruntfile.
    samccone committed Apr 14, 2014
  2. Adds newline to end of appRouter

    Fixes failing Travis build
    jmeas committed Apr 14, 2014
  3. Adds lint alias task back to the Gruntfile.

    Lint is an alias task to lint our Javascript and our whitespace. This
    alias task was accidentally removed in #971. Adding it back in resolves
    #1157.
    jmeas committed Apr 14, 2014
Commits on Apr 13, 2014
  1. Merge pull request #1158 from thejameskyle/fix-function-doc-link

    Fix Marionette functions doc actAsCollection Link
    samccone committed Apr 13, 2014