Tonix merge #31

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.

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

Merged

Eonasdan merged 102 commits into master from tonix-merge

Nov 20, 2020

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,5 @@ site @@
     *.sln
     *.nupkg
     /index.html
-    /test.html
+    /test.html
+    private_local_dir/**

.prettierignore

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		**

CONTRIBUTING.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,38 +1,33 @@
  
    Submitting Issues

    =================

    If you are submitting a bug, please test and/or fork [this jsfiddle](http://jsfiddle.net/Eonasdan/0Ltv25o8/) demonstrating the issue. Code issues and fringe case bugs that do not include a jsfiddle (or similar) will be closed.

    If you are submitting a bug, please test and/or fork [this JSFiddle](https://jsfiddle.net/nmocbjLf/1/) demonstrating the issue.

    In your Pull Request (PR), describe the use case and provide a link to your forked JSFiddle and possibly provide a code example in the PR itself.

    Issues that are submitted without a description (title only) will be closed with no further explanation.

    Contributing code

    =================

    To contribute, fork the library and install grunt and dependencies. You need [node](http://nodejs.org/); use [nvm](https://github.com/creationix/nvm) or [nenv](https://github.com/ryuone/nenv) to install it.

    PRs are welcome.

    **Working on your first Pull Request?** You can learn how from this _free_ series [How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github).

    To contribute, fork the library and install dependencies. You will need [node](http://nodejs.org/).

    You can use [nvm](https://github.com/nvm-sh/nvm) or [nenv](https://github.com/ryuone/nenv) to install it.

    Then, run the following commands:

    ```bash

    git clone https://github.com/Eonasdan/bootstrap-datetimepicker.git

    cd bootstrap-datetimepicker

    git clone https://github.com/tempusdominus/core.git

    cd tempusdominus

    npm install -g grunt-cli

    npm install

    git checkout development  # all patches against development branch, please!

    grunt                 # this runs tests and jshint

    npm run watch

    ```

    Very important notes

    ====================

     * **Pull requests to the `master` branch will be closed.** Please submit all pull requests to the `development` branch.

     * **Do not include the minified files in your pull request.** Don't worry, we'll build them when we cut a release.

     * Pull requests that do not include a description (title only) and the following will be closed:

      * What the change does

      * A use case (for new features or enhancements)

    Grunt tasks

    ===========

    We use Grunt for managing the build. Here are some useful Grunt tasks:

      * `grunt` The default task lints the code and runs the tests. You should make sure you do this before submitting a PR.

      * `grunt build` Compiles the less stylesheet and minifies the javascript source in build directory.

      * `grunt build:travis` Compliles and runs the jasmine/travis tests. **All PR's MUST pass tests in place**
      
     * **Please submit your pull requests to a new branch** (you may call it like you want, just choose a name that describes your feature/bugfix).

     * **You don't have to include the minified files in your pull request** (by running `npm run build-all`). Don't worry, we'll build them when we bump a new version.

Gruntfile.js

-Original file line number
+Diff line change
@@ Expand Up / @@ -110,7 +110,7 @@ module.exports = function (grunt) { @@
         ]);
         // Task to be run when building
-        grunt.registerTask('build', ['babel:dev', 'eslint', 'babel:dist']);
+        grunt.registerTask('build', ['babel:dev', 'eslint', 'babel:dist', 'uglify']);
         grunt.registerTask('test', ['build', 'env:paris', 'connect', 'jasmine']);
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tonix merge #31

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!