Skip to content

Commit

Permalink
Merge pull request #16 from Slyck-io/dev
Browse files Browse the repository at this point in the history
Release 3.0.0
  • Loading branch information
raymonddavis committed Dec 1, 2016
2 parents e125ebc + 4e60712 commit e0c6444
Show file tree
Hide file tree
Showing 2,919 changed files with 239,756 additions and 105,885 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
<a name="3.0.0"></a>
### 3.0.0 (11-31-2016)

#### Features

* Add filtering of labels ([#10](https://github.com/Slyck-io/SlyckSchedule/pull/10))
* Add Card loading animation ([#14](https://github.com/Slyck-io/SlyckSchedule/pull/14))
* Add Grunt Serve ([#6](https://github.com/Slyck-io/SlyckSchedule/pull/6))

#### Enhancements

* Schedule now compresses on filter change ([#13](https://github.com/Slyck-io/SlyckSchedule/pull/13))

#### Bugs Fixed

* Fixed schedule height not changing after data update ([#9](https://github.com/Slyck-io/SlyckSchedule/pull/9))

<a name="1.0.1"></a>
### 1.0.1 (11-28-2016)

Expand Down
50 changes: 49 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,52 @@
module.exports = function(grunt) {
// Load Grunt tasks declared in the package.json file
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);

grunt.initConfig({
// grunt-contrib-connect will serve the files of the project
// on specified port and hostname
connect: {
all: {
options: {
port: 9000,
hostname: "0.0.0.0",
// Prevents Grunt to close just after the task (starting the server) completes
// This will be removed later as `watch` will take care of that
//keepalive: true,
// Livereload needs connect to insert a cJavascript snippet
// in the pages it serves. This requires using a custom connect middleware
middleware: function(connect, options) {

return [

// Load the middleware provided by the livereload plugin
// that will take care of inserting the snippet
require('grunt-contrib-livereload/lib/utils').livereloadSnippet,

// Serve the project folder
connect.static(options.base)
];
}
}
}
},
open: {
all: {
// Gets the port from the connect configuration
path: 'http://localhost:<%= connect.all.options.port%>'
}
},
// grunt-regarde monitors the files and triggers livereload
// Surprisingly, livereload complains when you try to use grunt-contrib-watch instead of grunt-regarde
regarde: {
all: {
// This'll just watch the index.html file, you could add **/*.js or **/*.css
// to watch Javascript and CSS files too.
files: ['index.html', '**/*.js', '**/*.js'],
// This configures the task that will run when the file change
tasks: ['livereload', 'default']
}
},
uglify: {
options: {
mangle: true
Expand Down Expand Up @@ -92,4 +139,5 @@ module.exports = function(grunt) {

grunt.registerTask('default', ['less:development', 'autoprefixer', 'copy', 'watch']);
grunt.registerTask('build', ['uglify', 'less:production', 'autoprefixer', 'cssmin', 'copy']);
}
grunt.registerTask('serve', ['livereload-start', 'connect', 'open', 'regarde'])
}
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "SlyckSchedule",
"version": "1.0.1",
"version": "3.0.0",
"homepage": "https://github.com/Slyck-io/SlyckSchedule",
"authors": [
"raymonddavis <[email protected]>"
Expand Down
Loading

0 comments on commit e0c6444

Please sign in to comment.