Skip to content
This repository has been archived by the owner on Mar 26, 2024. It is now read-only.

Commit

Permalink
Merge branch 'feature/2.1.0' into gh-pages
Browse files Browse the repository at this point in the history
* feature/2.1.0: (36 commits)
  2.1.0 release
  document that the current time will be used for undefined args with isSame, isBefore, and isAfter
  no longer document Language#months as an array moment#25
  adding note on endof and startof week availability
  addressing moment#42
  fixing format weekday docs
  added a note in the lang docs about using the minified language files rather than the nodejs specific ones
  adding cdnjs note
  switching to rawgithub.com urls instead of raw.github.com urls
  noting cahnge in moment#month to clamp to the end of the target month
  creating duration from asp.net string, fixing duration subtract example
  Building docs
  Duration add, subtract, as, and get docs
  Adding ISO string docs
  Adding docs on AM/PM parsing
  Adding Lang#ordinal token argument
  adding missing doc files
  adding docs for max and min
  adding month string parsing
  adding timezone setter docs
  ...
  • Loading branch information
timrwood committed Jul 7, 2013
2 parents 1e4801c + 349eb05 commit 582a594
Show file tree
Hide file tree
Showing 440 changed files with 215,889 additions and 61,218 deletions.
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
node_modules/grunt*
node_modules/.bin/grunt*
node_modules/to-markdown*
node_modules
.DS_Store
.sass-cache

Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "libs/moment"]
path = libs/moment
url = git://github.com/timrwood/moment.git
[submodule "libs/moment-timezone"]
path = libs/moment-timezone
url = git@github.com:timrwood/moment-timezone.git
98 changes: 98 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
module.exports = function(grunt) {

grunt.initConfig({
concat: {
core_home: {
src: 'source/js/core-home.js',
dest: 'static/js/core-home.js'
},
core_test: {
src: [
'source/js/test-start.js',
'libs/nodeunit/nodeunit.js',
'libs/moment/test/moment/*.js',
'libs/moment/test/lang/*.js',
'source/js/test.js',
'source/js/test-end.js'
],
dest: 'static/js/core-test.js'
},
timezone_home: {
src: 'source/js/timezone-home.js',
dest: 'static/js/timezone-home.js'
},
timezone_data: {
src: 'source/js/timezone-data.js',
dest: 'static/js/timezone-data.js'
},
timezone_test: {
src: [
'source/js/test-start.js',
'libs/nodeunit/nodeunit.js',
'libs/moment-timezone/tests/**/*.js',
'source/js/test.js',
'source/js/test-end.js'
],
dest: 'static/js/timezone-test.js'
},
global: {
src: [
'libs/moment/moment.js',
'libs/moment/min/langs.js',
'libs/moment-timezone/moment-timezone.js',
'source/js/timezone-data-start.js',
'libs/moment-timezone/moment-timezone.json',
'source/js/timezone-data-end.js'
],
dest: 'static/js/global.js'
}
},
uglify: {
global: {
src: 'static/js/global.js',
dest: 'static/js/global.min.js'
}
},
compass: {
prod: {
options: {
sassDir: 'source/css',
cssDir: 'static/css'
}
}
},
html: {
files: [
"source/docs/**/*",
"source/templates/*"
]
},
watch: {
css: {
files: [
'source/css/*',
'source/css/**/*'
],
tasks: 'compass'
},
js: {
files: [
'source/**/*.js',
'libs/**/*.js'
],
tasks: ['concat', 'uglify']
}
}
});

grunt.registerTask("default", ["html", "concat", "uglify", "compass"]);

// plugin tasks
grunt.loadNpmTasks("grunt-contrib-compass");
grunt.loadNpmTasks("grunt-contrib-concat");
grunt.loadNpmTasks("grunt-contrib-uglify");
grunt.loadNpmTasks("grunt-contrib-watch");

// tasks
grunt.loadTasks("source/tasks");
};
1 change: 0 additions & 1 deletion css/style.css

This file was deleted.

Loading

0 comments on commit 582a594

Please sign in to comment.