Skip to content

Commit 445c482

Browse files
author
Florian Kissling
committed
Merge branch 'master' into docs-improvements
Conflicts: docs/announcements-4.0.html docs/index.html
2 parents b34e5b3 + b1a6d35 commit 445c482

67 files changed

Lines changed: 861 additions & 122 deletions

Some content is hidden

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

Gruntfile.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,12 @@ module.exports = function (grunt) {
1010
fullIncludes = [
1111
'jquery',
1212

13-
'select2/compat/matcher',
13+
'select2/compat/containerCss',
14+
'select2/compat/dropdownCss',
15+
1416
'select2/compat/initSelection',
1517
'select2/compat/inputData',
18+
'select2/compat/matcher',
1619
'select2/compat/query',
1720

1821
'select2/dropdown/attachContainer',

component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "select2",
33
"repo": "select/select2",
44
"description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
5-
"version": "4.0.0-rc.2",
5+
"version": "4.0.0",
66
"demo": "https://select2.github.io/",
77
"keywords": [
88
"jquery"

dist/js/i18n/az.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/bg.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/ca.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/cs.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/da.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/de.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/en.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/i18n/es.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)