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 IcedCoffeeScript support, add lazy loading for CoffeeScript and Iced... #2599

Merged
merged 15 commits into from
Apr 22, 2015
Merged

Add IcedCoffeeScript support, add lazy loading for CoffeeScript and Iced... #2599

merged 15 commits into from
Apr 22, 2015

Commits on Jan 30, 2015

  1. Add IcedCoffeeScript support, add lazy loading for CoffeeScript and I… 

    …cedCoffeeScript
    @internalfx
    internalfx committed Jan 30, 2015
    Configuration menu
    Copy the full SHA
    23db0c8 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2015

  1. Add sails.config.moduleloader, and build regexes from global config

    @internalfx
    internalfx committed Jan 31, 2015
    Configuration menu
    Copy the full SHA
    508d6c1 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. Merge remote-tracking branch 'upstream/master' into icy_coffee

    @internalfx
    internalfx committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    6c309ac View commit details
    Browse the repository at this point in the history

  2. fix typo

    @internalfx
    internalfx committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    1f93490 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. Merge remote-tracking branch 'upstream/master' into icy_coffee

    @internalfx
    internalfx committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    e768c64 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2015

  1. Merge remote-tracking branch 'upstream/master' into icy_coffee

    @internalfx
    internalfx committed Mar 2, 2015
    Configuration menu
    Copy the full SHA
    c40d9fa View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2015

  1. Merge branch 'master' of github.com:balderdashy/sails into icy_coffee

    @internalfx
    internalfx committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    afb346f View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2015

  1. Merge branch 'master' of github.com:balderdashy/sails into icy_coffee

    @internalfx
    internalfx committed Mar 29, 2015
    Configuration menu
    Copy the full SHA
    3d390b7 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Merge branch 'master' of https://github.com/balderdashy/sails into ic… 

    …y_coffee

Conflicts:
	lib/hooks/moduleloader/index.js
    @internalfx
    internalfx committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    6e57b7d View commit details
    Browse the repository at this point in the history

  2. Add livescript support

    @internalfx
    internalfx committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    36dde17 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2015

  1. Merge branch 'master' of https://github.com/balderdashy/sails into ic… 

    …y_coffee
    @internalfx
    internalfx committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    5685d67 View commit details
    Browse the repository at this point in the history

  2. Remove TODO's since I did them 😄

    @internalfx
    internalfx committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    4d5fbf6 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2015

  1. cleanup, make code DRY'er, allow easy addition of new languages

    @internalfx
    internalfx committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    138eefb View commit details
    Browse the repository at this point in the history

  2. add comments on the supported languages array

    @internalfx
    internalfx committed Apr 18, 2015
    1 Configuration menu
    Copy the full SHA
    7d8d61a View commit details
    Browse the repository at this point in the history

  3. fix failing test

    @internalfx
    internalfx committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    5193ba7 View commit details
    Browse the repository at this point in the history