Skip to content

Commit 7cbd751

Browse files
committed
Merge branch 'telerik:master' into master
2 parents e0bdbf2 + 918b236 commit 7cbd751

File tree

6,669 files changed

+619371
-349799
lines changed

Some content is hidden

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

6,669 files changed

+619371
-349799
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**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** !
44

5-
**For Feature Requests - please submit those into [our UserVoice feedback portal](http://kendo.uservoice.com/)**
5+
**For Feature Requests - please submit those into [our feedback portal](https://www.telerik.com/support/feedback)**
66

77
### Reproduction of the problem
88
_(bug report only)_
@@ -17,7 +17,7 @@ Explain what the expected behavior of the functionality is
1717

1818
### Environment
1919

20-
* **Kendo UI version:** 201x.r.ddd
20+
* **Kendo UI version:** 202x.r.ddd
2121
* **jQuery version:** x.y
2222
* **Browser:** [all | Chrome XX | Firefox XX | IE XX | Safari XX | Mobile Chrome XX | Android X.X Web Browser | iOS XX Safari | iOS XX UIWebView | iOS XX WKWebView ]
2323

.travis.yml

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,17 @@
1-
language: node_js
2-
node_js:
3-
- '4'
4-
env:
5-
- CXX=g++-4.8
1+
sudo: false
2+
dist: xenial
3+
64
addons:
7-
apt:
8-
sources:
9-
- ubuntu-toolchain-r-test
10-
packages:
11-
- g++-4.8
12-
- google-chrome-stable
5+
chrome: stable
6+
7+
notifications:
8+
email: false
9+
10+
language: node_js
11+
1312
cache:
1413
directories:
1514
- node_modules
16-
before_install:
17-
- npm i -g npm@^3.8.0
18-
- export CHROME_BIN=chromium-browser
19-
- export DISPLAY=:99.0
20-
- sh -e /etc/init.d/xvfb start &
21-
- sleep 3
22-
notifications:
23-
email: false
24-
dist: trusty
25-
sudo: false
15+
16+
node_js:
17+
- '8'

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This project has been released under the [Apache License, version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html), the text of which is included below. This license applies ONLY to the source of this repository and does not extend to any other Kendo UI distribution or variant, or any other 3rd party libraries used in a repository. For licensing information about Kendo UI, see the [License Agreements page](https://www.kendoui.com/purchase/license-agreement.aspx) at [KendoUI.com](http://www.kendoui.com).
22

3-
> Copyright © 2014-2015 Telerik
3+
> Copyright © 2014-2018 Progress Software
44
55
> Licensed under the Apache License, Version 2.0 (the "License");
66
you may not use this file except in compliance with the License.

README.md

Lines changed: 132 additions & 99 deletions
Large diffs are not rendered by default.

VERSION

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

build/gulp/css.js

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,25 @@
22

33
var lazypipe = require('lazypipe');
44
var less = require('gulp-less');
5-
var autoprefix = require('less-plugin-autoprefix');
65
var logger = require('gulp-logger');
76
var cleanCss = require('gulp-clean-css');
87
var replace = require('gulp-replace');
98
var rename = require('gulp-rename');
109
var cache = require('gulp-cached');
1110
var progeny = require('gulp-progeny');
1211

13-
var browsers = [
14-
"Explorer >= 8",
15-
"Chrome >= 21",
16-
"Firefox ESR",
17-
"Opera >= 15",
18-
"Android >= 2.3",
19-
"Safari >= 6.2.6",
20-
"ExplorerMobile >= 10",
21-
"iOS >= 6",
22-
"BlackBerry >= 10"
23-
].join(",");
24-
2512
var cleanCssOptions = {
26-
compatibility: 'ie7',
13+
compatibility: 'ie9',
2714
aggressiveMerging: false,
2815
advanced: false
2916
};
3017

3118
module.exports.fromLess = lazypipe()
3219
.pipe(logger, { after: 'LESS complete!', extname: '.css', showChange: true })
3320
.pipe(less, {
34-
strictMath: 'on',
35-
relativeUrls: true,
36-
plugins: [
37-
new autoprefix({ browsers: browsers })
38-
]
21+
math: 'strict',
22+
relativeUrls: true,
23+
plugins: []
3924
})
4025
.pipe(replace, /\.\.\/mobile\//g, ''); // temp hack for the discrepancy between source and generated "source"
4126

build/gulp/tasks/karma.js

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,31 @@ TESTS.beforeTestFiles.push('src/angular.js');
4242
TESTS.beforeTestFiles.push('tests/angular-route.js');
4343
TESTS.beforeTestFiles.push('tests/jasmine.js');
4444
TESTS.beforeTestFiles.push('tests/jasmine-boot.js');
45+
TESTS.beforeTestFiles.push('node_modules/axe-core/axe.js');
4546

4647
var defaultOptions = {
4748
reportSlowerThan: 500,
4849
basePath: '',
49-
frameworks: ['qunit'],
50+
frameworks: ['mocha', 'chai'],
5051
preprocessors: {
5152
'tests/**/.html': [],
5253
'tests/**/*-fixture.html': ['html2js']
5354
},
54-
reporters: ['progress'],
55+
reporters: ['spec'],
5556
colors: true,
5657
autoWatch: true,
5758
browsers: browsers,
5859
customLaunchers: {
5960
ChromiumTravis: {
60-
base: 'Chrome',
61+
base: 'ChromeHeadless',
6162
flags: ['--no-sandbox']
6263
}
6364
},
64-
65+
client: {
66+
mocha: {
67+
timeout: 10000
68+
}
69+
},
6570
junitReporter: {
6671
outputDir: '.',
6772
outputFile: argv['junit-results']
@@ -98,26 +103,13 @@ var flavours = {
98103
)
99104
},
100105

101-
unit: {
106+
mocha: {
102107
files: [].concat(
103108
TESTS.beforeTestFiles,
104109
allKendoFiles,
105110
TESTS.afterTestFiles,
106111
tests
107112
)
108-
},
109-
110-
legacyUnit: {
111-
browsers: browserOption ? [ browserOption ] : [],
112-
113-
files: [].concat(
114-
TESTS.beforeTestFiles,
115-
allKendoFiles,
116-
TESTS.afterTestFiles,
117-
tests
118-
).filter(function(x) {
119-
return !/(themeuilder|less)\.js|angular/i.test(x);
120-
})
121113
}
122114
};
123115

build/package-core.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://github.com/telerik/kendo-ui-core.git"
88
},
99
"dependencies": {
10-
"jquery": "<3.0.0"
10+
"jquery": "3.5.1"
1111
},
1212
"main": "js/kendo.ui.core.js"
1313
}

build/test-paths-core.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
exports.beforeTestFiles = [
2-
'dist/styles/web/kendo.common.core.min.css',
2+
'dist/styles/web/kendo.common.min.css',
33
'dist/styles/mobile/kendo.mobile.all.min.css',
44
'dist/styles/web/kendo.rtl.css',
55
{ pattern: 'dist/styles/**/*.*', watched: true, included: false },
@@ -14,9 +14,7 @@ exports.afterTestFiles = [
1414
'src/cultures/kendo.culture.en-ZA.js',
1515
"src/cultures/kendo.culture.es-ES.js",
1616
'tests/kendo-test-helpers.js',
17-
'tests/**/test-helper.js',
18-
19-
'src/kendo.webcomponents.js'
17+
'tests/**/test-helper.js'
2018
];
2119

2220
exports.ciFiles = [ 'dist/js/kendo.ui.core.min.js' ];

docs-aspnet-core/.gitignore

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

0 commit comments

Comments
 (0)