Skip to content

Commit a8af0c5

Browse files
authored
Merge pull request #2 from telerik/master
Sync
2 parents 4152373 + 84761c5 commit a8af0c5

File tree

3,064 files changed

+159972
-71158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,064 files changed

+159972
-71158
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
### Bug report/Feature request
2-
_(leave only one)_
1+
### Bug report
32

43
**For Support request - Please do not submit support request here, instead see the** [Kendo UI Premium Forums](http://www.telerik.com/forums/kendo-ui) or our [support system](http://www.telerik.com/support) **at Telerik.com** !
54

5+
**For Feature Requests - please submit those into [our UserVoice feedback portal](http://kendo.uservoice.com/)**
6+
67
### Reproduction of the problem
78
_(bug report only)_
89
If the current behavior is a bug or you can illustrate your feature request better with an example, please provide the steps to reproduce and if possible a minimal demo of the problem via http://dojo.telerik.com or similar.
@@ -14,10 +15,6 @@ Provide additional information if the steps for reproducing the faulty behavior
1415
### Expected/desired behavior
1516
Explain what the expected behavior of the functionality is
1617

17-
### Reason for Suggesting the Feature
18-
_(feature report only)_
19-
Provide information about what necessitates the implementation of this feature.
20-
2118
### Environment
2219

2320
* **Kendo UI version:** 201x.r.ddd

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ dist/
1111
.DS_Store
1212
.JustCode
1313
.bundle/
14+
.idea/
15+
.vscode/
1416
.livereload
1517
.dir-locals.el
1618
!src/jquery.min.js

.travis.yml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
11
language: node_js
22
node_js:
3-
- 4.1.0
3+
- '4'
4+
env:
5+
- CXX=g++-4.8
6+
addons:
7+
apt:
8+
sources:
9+
- ubuntu-toolchain-r-test
10+
packages:
11+
- g++-4.8
12+
- google-chrome-stable
413
cache:
514
directories:
615
- node_modules
716
before_install:
17+
- npm i -g npm@^3.8.0
818
- export CHROME_BIN=chromium-browser
919
- export DISPLAY=:99.0
10-
- sh -e /etc/init.d/xvfb start
20+
- sh -e /etc/init.d/xvfb start &
21+
- sleep 3
1122
notifications:
1223
email: false
13-
slack:
14-
on_success: never
15-
secure: QFMZSJNCI5H5xzoIcDbJfzgR9AH7FuBD4tOyqRr/FMfEm1mV5eInvgUSmz0xFN3TpDMwJXKi41mrquK6/ey3DEgI0Jm5M32FTis+HahXp3R6zamD7+6Y0WaTxhILcULPqJVo2Ce4WtMqbmrEyk2xLFSYPhFt9wPna9aFO4j+OZw=
24+
dist: trusty
1625
sudo: false

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
Kendo UI is everything you need to build sites and apps with HTML5 & JavaScript. Kendo UI Core is the free and open-source version of Kendo UI that provides access to the web's best UI widgets and key framework features, essential for developing great experiences for the web and mobile.
88

9+
910
## Features of Kendo UI Core
1011

1112
Kendo UI Core is a free and open-source subset of Kendo UI. The following table details the widgets and features available in Kendo UI Core, as well as the additional features available via a commercial Kendo UI license.
@@ -129,7 +130,7 @@ There are two ways to get the source code for Kendo UI Core. You can either down
129130

130131
In order to build Kendo UI Core, you need to have **Node.js 4.x** and **git 2.x**.
131132

132-
For Windows you have to download and install [Git for Windows](https://git-for-windows.github.io/) and [Node.js](http://nodejs.org/download/).
133+
For Windows you have to download and install [Git for Windows](https://git-for-windows.github.io/) and [Node.js](http://nodejs.org/download/) and [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools).
133134

134135
Mac OS users should install [Homebrew](http://mxcl.github.com/homebrew/). Once Homebrew is installed, run `brew install git` to install git, and `brew install node` to install Node.js.
135136

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "year": 2016, "release": 3 }
1+
{ "year": 2017, "release": 3 }

build/gulp/css.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var lazypipe = require('lazypipe');
44
var less = require('gulp-less');
55
var autoprefix = require('less-plugin-autoprefix');
66
var logger = require('gulp-logger');
7-
var minifyCSS = require('gulp-minify-css');
7+
var cleanCss = require('gulp-clean-css');
88
var replace = require('gulp-replace');
99
var rename = require('gulp-rename');
1010
var cache = require('gulp-cached');
@@ -30,12 +30,18 @@ var cleanCssOptions = {
3030

3131
module.exports.fromLess = lazypipe()
3232
.pipe(logger, { after: 'LESS complete!', extname: '.css', showChange: true })
33-
.pipe(less, { relativeUrls: true, plugins: [new autoprefix({ browsers: browsers }) ] })
33+
.pipe(less, {
34+
strictMath: 'on',
35+
relativeUrls: true,
36+
plugins: [
37+
new autoprefix({ browsers: browsers })
38+
]
39+
})
3440
.pipe(replace, /\.\.\/mobile\//g, ''); // temp hack for the discrepancy between source and generated "source"
3541

3642
module.exports.minify = lazypipe()
3743
.pipe(logger, { after: 'Min CSS complete!', extname: '.min.css', showChange: true } )
38-
.pipe(minifyCSS, cleanCssOptions)
44+
.pipe(cleanCss, cleanCssOptions)
3945
.pipe(rename, { suffix: ".min" });
4046

4147
module.exports.cacheLessDependencies = lazypipe()

build/gulp/tasks/karma.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ TESTS.beforeTestFiles.push(jquery);
4040
TESTS.beforeTestFiles.push('tests/jquery.mockjax.js');
4141
TESTS.beforeTestFiles.push('src/angular.js');
4242
TESTS.beforeTestFiles.push('tests/angular-route.js');
43+
TESTS.beforeTestFiles.push('tests/jasmine.js');
44+
TESTS.beforeTestFiles.push('tests/jasmine-boot.js');
4345

4446
var defaultOptions = {
4547
reportSlowerThan: 500,

build/gulp/uglify.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function renameModules(match) {
2626

2727
module.exports = lazypipe()
2828
.pipe(logger, { after: 'uglify complete', extname: '.min.js', showChange: true })
29-
.pipe(uglify, { compress, mangle, preserveComments: "license" })
29+
.pipe(uglify, { compress: compress, mangle: mangle, preserveComments: "license" })
3030
.pipe(replace, /define\("[\w\.\-\/]+".+?\]/g, renameModules)
3131
.pipe(replace, /"kendo\.core"/g, '"kendo.core.min"')
3232
.pipe(rename, { suffix: ".min" });

build/package-pro.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs-aspnet-core/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.DS_Store
2+
Gemfile.lock
3+
_site
4+
api/aspnet-mvc

0 commit comments

Comments
 (0)