Skip to content

Commit d96af3d

Browse files
upluswareuplusware
authored
Merge branch 'jquery:main' into master
2 parents c5204f7 + 1f0851b commit d96af3d

File tree

11 files changed

+4256
-4395
lines changed

11 files changed

+4256
-4395
lines changed

‎CONTRIBUTING.md

-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ There are a number of ways to get involved with the development of jQuery UI. Ev
1212

1313
This is the best way to contribute to jQuery UI. Please read through the full guide detailing [How to Report Bugs](http://contribute.jquery.org/bug-reports/).
1414

15-
### Weekly Meetings
16-
17-
Every week (unless otherwise noted) the jQuery UI team has a meeting to discuss the progress of current work and to bring forward possible new blockers for discussion. The meeting is held on [IRC](http://irc.jquery.org) in the #jquery-meeting channel at [Noon EST](http://www.timeanddate.com/worldclock/fixedtime.html?month=1&day=17&year=2011&hour=12&min=0&sec=0&p1=43) on Wednesdays. Meeting notes are posted on http://meetings.jquery.org/category/ui/ after each meeting.
18-
1915
## Tips for Getting Started
2016

2117
### Environment: Minimum Required

‎Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ grunt.initConfig( {
286286
"jquery-simulate/jquery.simulate.js": "jquery-simulate/jquery.simulate.js",
287287
"jquery-simulate/LICENSE.txt": "jquery-simulate/LICENSE.txt",
288288

289-
"jquery/jquery.js": "jquery-1.x/dist/jquery.js",
290-
"jquery/LICENSE.txt": "jquery-1.x/LICENSE.txt",
289+
"jquery/jquery.js": "jquery-3.x/dist/jquery.js",
290+
"jquery/LICENSE.txt": "jquery-3.x/LICENSE.txt",
291291

292292
"jquery-1.8.0/jquery.js": "jquery-1.8.0/jquery.js",
293293
"jquery-1.8.0/MIT-LICENSE.txt": "jquery-1.8.0/MIT-LICENSE.txt",

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jQuery UI is a curated set of user interface interactions, effects, widgets, and
77

88
If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started, [jqueryui.com/demos/](http://jqueryui.com/demos/) for demos, [api.jqueryui.com](http://api.jqueryui.com/) for API documentation, or the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
99

10-
If you want to report a bug/issue, please visit [bugs.jqueryui.com](http://bugs.jqueryui.com).
10+
If you want to report a bug/issue, please visit [the GitHub issues page](https://github.com/jquery/jquery-ui/issues). Archive of older bug reports is kept for historical reasons in read-only mode at [bugs.jqueryui.com](http://bugs.jqueryui.com). If any of them still matters to you, please open a bug about it on GitHub, linking to the legacy [bugs.jqueryui.com](http://bugs.jqueryui.com) issue for context.
1111

1212
If you are interested in helping develop jQuery UI, you are in the right place.
1313
To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui) or [#jqueryui-dev on irc.freenode.net](http://irc.jquery.org/).

‎bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
],
1010
"license": "MIT",
1111
"dependencies": {
12-
"jquery": ">=1.6"
12+
"jquery": ">=1.8.0 <4.0.0"
1313
},
1414
"devDependencies": {
1515
"jquery-color": "2.2.0",
@@ -39,7 +39,7 @@
3939
"jquery-1.12.2": "jquery#1.12.2",
4040
"jquery-1.12.3": "jquery#1.12.3",
4141
"jquery-1.12.4": "jquery#1.12.4",
42-
"jquery-1.x": "jquery#1.12.4",
42+
"jquery-3.x": "jquery#3.6.0",
4343
"jquery-2.0.0": "jquery#2.0.0",
4444
"jquery-2.0.1": "jquery#2.0.1",
4545
"jquery-2.0.2": "jquery#2.0.2",

‎build/release.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ function buildCDNPackage( callback ) {
104104

105105
Release.define( {
106106
npmPublish: true,
107-
issueTracker: "trac",
108-
contributorReportId: 22,
107+
issueTracker: "github",
109108
changelogShell: function() {
110109
var monthNames = [ "January", "February", "March", "April", "May", "June", "July",
111110
"August", "September", "October", "November", "December" ],
@@ -140,7 +139,7 @@ Release.define( {
140139
};
141140

142141
module.exports.dependencies = [
143-
"download.jqueryui.com@2.2.4",
142+
"download.jqueryui.com@2.2.7",
144143
"node-packager@0.0.6",
145144
"shelljs@0.8.4"
146145
];

‎external/jquery/LICENSE.txt

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
Copyright jQuery Foundation and other contributors, https://jquery.org/
2-
3-
This software consists of voluntary contributions made by many
4-
individuals. For exact contribution history, see the revision history
5-
available at https://github.com/jquery/jquery
6-
7-
The following license applies to all parts of this software except as
8-
documented below:
9-
10-
====
1+
Copyright OpenJS Foundation and other contributors, https://openjsf.org/
112

123
Permission is hereby granted, free of charge, to any person obtaining
134
a copy of this software and associated documentation files (the
@@ -27,10 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
2718
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
2819
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2920
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
30-
31-
====
32-
33-
All files located in the node_modules and external directories are
34-
externally maintained libraries used by this software which have their
35-
own licenses; we recommend you read them, as their terms may differ from
36-
the terms above.

0 commit comments

Comments
 (0)