Skip to content

Commit

Permalink
Resolve #63 (v3.0.2)
Browse files Browse the repository at this point in the history
  • Loading branch information
jh3y committed Jul 17, 2017
1 parent 7483501 commit d1a1ae4
Show file tree
Hide file tree
Showing 12 changed files with 8,245 additions and 1,227 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "4"
sudo: false
install:
- npm install -g mocha-phantomjs
Expand All @@ -12,4 +12,4 @@ before_script:
- gulp build:complete
- sleep 5 # give gulp background task some time to execute.
script:
- mocha-phantomjs /test/index.html
- npm run test
3 changes: 1 addition & 2 deletions CONTRIBUTING.md
Expand Up @@ -28,8 +28,7 @@ The most important thing to me is that people aren't afraid of contributing. If
2. Navigate into the repo and install the dependencies.

cd tyto
npm install
bower install
yarn/npm install

3. Run gulp to take care of preprocessing and running a local static webserver instance(the project uses BrowserSync).

Expand Down
7 changes: 7 additions & 0 deletions ISSUE_TEMPLATE.md
@@ -0,0 +1,7 @@
### Issue summary

### Expected behavior

### Browser used

### Steps to reproduce
2 changes: 1 addition & 1 deletion LICENSE
Expand Up @@ -2,7 +2,7 @@
tyto - http://jh3y.github.io/tyto
Licensed under the MIT license

jh3y (c) 2016
jh3y (c) 2017

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
1 change: 1 addition & 0 deletions LOG.md
Expand Up @@ -10,3 +10,4 @@ Log ![alt tag](https://raw.github.com/jh3y/tyto/master/src/img/tyto.png)
* __17/10/15__: Implement dynamic linking between entities via Markdown `#`.
* __16/09/16__: V3.0.0 Removal of CoffeeScript in favor of Babel ES6 + various bug fixes/improvements.
* __06/12/16__: V3.0.1 Removal of Bower in favor of just npm use with Yarn. Fix issues #60 and #61
* __17/07/2017__: V3.0.2 Update `yarn.lock` and deps to use `jquery/jquery-ui`. Update vendor scripts required. Add `package-lock.json`
11 changes: 11 additions & 0 deletions PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
Fixes # || Adds new feature X

#### Changes include
* a
* b
* c

#### Checks
- [ ] Updated documentation (_if applicable_)
- [ ] Updated versioning
- [ ] Passes tests
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -119,4 +119,4 @@ MIT

---------------------------

Made with :sparkles: [@jh3y](https://twitter.com/@_jh3y) 2016
Made with :sparkles: [@jh3y](https://twitter.com/@_jh3y) 2017
12 changes: 11 additions & 1 deletion gulp-config.js
Expand Up @@ -80,7 +80,17 @@ module.exports = {
vendorDir + 'backbone.wreqr/lib/backbone.wreqr.js',
vendorDir + 'backbone.localstorage/backbone.localStorage.js',
vendorDir + 'backbone.marionette/lib/backbone.marionette.js',
vendorDir + 'jquery-ui/jquery-ui.js',
/**
* In order to use jquery/jquery-ui, need to require specific
* modules in order to get sortable working.
*/
vendorDir + 'jquery-ui/ui/data.js',
vendorDir + 'jquery-ui/ui/widget.js',
vendorDir + 'jquery-ui/ui/widgets/mouse.js',
vendorDir + 'jquery-ui/ui/widgets/sortable.js',
vendorDir + 'jquery-ui/ui/scroll-parent.js',
vendorDir + 'jquery-ui/ui/version.js',
vendorDir + 'jquery-ui/ui/ie.js',
vendorDir + 'jquery-ui-touch-punch/jquery.ui.touch-punch.min.js',
vendorDir + 'material-design-lite/material.js',
vendorDir + 'marked/marked.min.js'
Expand Down

0 comments on commit d1a1ae4

Please sign in to comment.