diff --git a/components/package.json b/components/package.json index 1b5079c0a74..64be1ba12d3 100644 --- a/components/package.json +++ b/components/package.json @@ -12,13 +12,11 @@ "chosen-bootstrap": "https://github.com/dbtek/chosen-bootstrap", "chosen-js": "^1.8.7", "clipboard": "^2.0.11", - "datatables.net": "^1.13.4", - "datatables.net-buttons-bs": "^2.3.6", - "datatables.net-buttons-dt": "^2.3.6", - "datatables.net-colreorder": "^1.6.1", - "datatables.net-dt": "^1.13.4", - "drmonty-datatables-plugins": "^1.0.0", - "drmonty-datatables-responsive": "^1.0.0", + "datatables.net": "^2.0.7", + "datatables.net-buttons-bs": "^3.0.2", + "datatables.net-buttons-dt": "^3.0.2", + "datatables.net-colreorder": "^2.0.2", + "datatables.net-dt": "^2.0.7", "easymde": "^2.18.0", "flot": "flot/flot#~0.8.3", "font-awesome": "^4.0.0", diff --git a/components/yarn.lock b/components/yarn.lock index e346338a1b3..5e3bdd4035a 100644 --- a/components/yarn.lock +++ b/components/yarn.lock @@ -270,60 +270,60 @@ dash-ast@^2.0.1: resolved "https://registry.yarnpkg.com/dash-ast/-/dash-ast-2.0.1.tgz#8d0fd2e601c59bf874cc22877ee7dd889f54dee8" integrity sha512-5TXltWJGc+RdnabUGzhRae1TRq6m4gr+3K2wQX0is5/F2yS6MJXJvLyI3ErAnsAXuJoGqvfVD5icRgim07DrxQ== -datatables.net-bs@>=1.12.1: - version "1.13.4" - resolved "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-1.13.4.tgz#cdab0810f800c21b44ca5c9422120119da13178f" - integrity sha512-Do+O8HP8xVoayizysOWDBxURDbDmLAKiXDAp0cFl1RFFb5v/SIl+zuBZ03FXjdEs3JN5OksPMcY7WYeHZCaFeQ== +datatables.net-bs@^2: + version "2.0.7" + resolved "https://registry.yarnpkg.com/datatables.net-bs/-/datatables.net-bs-2.0.7.tgz#4ccbde65fcd9715eafd7e9f53af31cc5400064a6" + integrity sha512-e6IXGcLKDxGzUNIKiJaSa7yIDIIaDK8QcF8letCPHyEHWfmYlENEvfGNFOUAL6JOnZodbIIc5XDI/9K1PcEzHg== dependencies: - datatables.net ">=1.12.1" + datatables.net "2.0.7" jquery ">=1.7" -datatables.net-buttons-bs@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-2.3.6.tgz#db92dffd68432816cd3c177f30d5b5099452c061" - integrity sha512-7ZYZJpMDpLBgdUQO2lgdqwUT4aO00DMuCNonaKtpYkwsSAgoOS5mJye+EZEv4hr4zOh9tBWcrMGSgNT/Ffk+LQ== +datatables.net-buttons-bs@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/datatables.net-buttons-bs/-/datatables.net-buttons-bs-3.0.2.tgz#20287bb0588008b256bd8bb75ed9dc8399d94859" + integrity sha512-1linLDv9Jog0IzDR09ImzBJpl5iC00XJdULf8HjCXg9qM31kt4Ns7CBHkL1/Z8fom4D5xSl924e3arJIXjqNZQ== dependencies: - datatables.net-bs ">=1.12.1" - datatables.net-buttons ">=2.2.3" + datatables.net-bs "^2" + datatables.net-buttons "3.0.2" jquery ">=1.7" -datatables.net-buttons-dt@^2.3.6: - version "2.3.6" - resolved "https://registry.yarnpkg.com/datatables.net-buttons-dt/-/datatables.net-buttons-dt-2.3.6.tgz#43f1ba2775c1a011ca955f128f1e1c7e5cf1df72" - integrity sha512-SF91mQCPePbjp/Tct2TWlwywaEH/qjdYQf71f7puHBXPre2vvJhy4aJhoyJMfgIOkEzS7Duw6anlBSUC26JqhQ== +datatables.net-buttons-dt@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/datatables.net-buttons-dt/-/datatables.net-buttons-dt-3.0.2.tgz#5fcbe229ba781a4e2613edaab192477615b77d86" + integrity sha512-TIzu5D81zNwcXUO6flVqDb8zKpGlhl1D2CLA8vfktMsBtFVa6xJ92rB/0np9yuFpWjkxtM3ivYLGiyWmbCF9Ow== dependencies: - datatables.net-buttons ">=2.2.3" - datatables.net-dt ">=1.12.1" + datatables.net-buttons "3.0.2" + datatables.net-dt "^2" jquery ">=1.7" -datatables.net-buttons@>=2.2.3: - version "2.3.6" - resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-2.3.6.tgz#68d74ccfb282a558e4a9d525871b20e017f7fea3" - integrity sha512-9eid5D2kbTNfGCOiEx5WBHlwfK38W1LMz0AiNZHoSqKAiO0aXGfzrH7L2eY6reHgVMaPvHPAnqeRAjvOul2V/Q== +datatables.net-buttons@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/datatables.net-buttons/-/datatables.net-buttons-3.0.2.tgz#5d4ac407e9e6960963c88ef40839168e5d0dd8d3" + integrity sha512-J+vk4hLtTivnl+RxzpKPE7CG4ggdgHPQcHnpqViy9w6ia18Uh69dQktX6NJ87QrqNPCTMUyHDzUzsRFURG4/Fw== dependencies: - datatables.net ">=1.12.1" + datatables.net "^2" jquery ">=1.7" -datatables.net-colreorder@^1.6.1: - version "1.6.2" - resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-1.6.2.tgz#27a29d2ea34fc60ce831bade51633d90293404d3" - integrity sha512-PrBzZA2mzBsI6NAMbgUykSdmZ3VJsf46chkeBy/1oiyArGc1e1/a5PLyb0HybkbZaFPWxeGxDAEJDVesC7j9pA== +datatables.net-colreorder@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/datatables.net-colreorder/-/datatables.net-colreorder-2.0.2.tgz#d7ab8ee85fef3f40f480e0bbf8f6aec57c8afde8" + integrity sha512-Y9OkaUOzaPWcDZ7vaXrnmVQz/i+VViNz2jx4Zm0UhMGA3LirS1xfrSqAjAqRmC/UrFxqoiTqbX768Dfd7pgBqA== dependencies: - datatables.net ">=1.12.1" + datatables.net "^2" jquery ">=1.7" -datatables.net-dt@>=1.12.1, datatables.net-dt@^1.13.4: - version "1.13.4" - resolved "https://registry.yarnpkg.com/datatables.net-dt/-/datatables.net-dt-1.13.4.tgz#ec32d22a02772ee6dda2677032cb6b24f3f5e4d0" - integrity sha512-QAvuEej/qKSiaSmSeDQ36wWO72XzFGKkd0jdiqbp+2FHAAzIk+ffsqQAwylystMoBSiO0zlcdaqHoAPa5Dy7Pg== +datatables.net-dt@^2, datatables.net-dt@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/datatables.net-dt/-/datatables.net-dt-2.0.7.tgz#4404c1c1026a4a495a30df99ccf828f0bc13bd7e" + integrity sha512-geClTADRyr/3B4S4eXLspidnkTzwvyLlUivYLQBlmq6M3+AAz1MI7kYXDEuOLC12Q8cvaABXFPI0oQ7Z4VZp4A== dependencies: - datatables.net ">=1.12.1" + datatables.net "2.0.7" jquery ">=1.7" -datatables.net@>=1.12.1, datatables.net@^1.13.4: - version "1.13.4" - resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.4.tgz#9a809cee82eca0a884e10b4d47a3a3d6e65e9fe7" - integrity sha512-yzhArTOB6tPO2QFKm1z3hA4vabtt2hRvgw8XLsT1xqEirinfGYqWDiWXlkTPTaJv2e7gG+Kf985sXkzBFlGrGQ== +datatables.net@2.0.7, datatables.net@^2, datatables.net@^2.0.7: + version "2.0.7" + resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-2.0.7.tgz#8af61ac17334c37ae3bd77fc2828a3571e052041" + integrity sha512-cyW+HZwkMzb4bLrao/SS9/i64ZHiw5nYhXl+OwuOPgddG+R9O11iOEke8wYsdiyOQmjv2mE6xkEmRMZwHZc8zw== dependencies: jquery ">=1.7" @@ -362,20 +362,6 @@ dfa@^1.2.0: resolved "https://registry.yarnpkg.com/dfa/-/dfa-1.2.0.tgz#96ac3204e2d29c49ea5b57af8d92c2ae12790657" integrity sha512-ED3jP8saaweFTjeGX8HQPjeC1YYyZs98jGNZx6IiBvxW7JG5v492kamAQB3m2wop07CvU/RQmzcKr6bgcC5D/Q== -drmonty-datatables-plugins@^1.0.0: - version "1.10.12" - resolved "https://registry.yarnpkg.com/drmonty-datatables-plugins/-/drmonty-datatables-plugins-1.10.12.tgz#32fd57f562c938c2da4445cea9675330dd968eb1" - integrity sha512-IhyTEXzyHlIFTT9SOOgLidebGuuikPtm3O7sX6D5CL2K6JAURnOp8ZKRuhZG7p3oTjYUnzr7i77l/YhQ9DnEjQ== - dependencies: - jquery ">=1.7" - -drmonty-datatables-responsive@^1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/drmonty-datatables-responsive/-/drmonty-datatables-responsive-1.0.6.tgz#1c5c1de5ece54eefacf39f95daf75c43b7fffefd" - integrity sha512-2boqoLJ6FxXgtZ6KVtguX5wN5YTTi72TgLekjvziNXmy8a6LZ+5XhwtgcZxHcFeOU0gWIPqFCHi2Pvp+OKidiA== - dependencies: - jquery ">=1.7.0" - duplexer2@~0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" @@ -699,7 +685,7 @@ jquery.hotkeys@jeresig/jquery.hotkeys#master: version "0.2.0" resolved "https://codeload.github.com/jeresig/jquery.hotkeys/tar.gz/f24f1da275aab7881ab501055c256add6f690de4" -"jquery@>= 1.0.0", jquery@>=1.7, jquery@>=1.7.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.7.1: +"jquery@>= 1.0.0", jquery@>=1.7, "jquery@>=1.8.0 <4.0.0", jquery@^3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.7.1.tgz#083ef98927c9a6a74d05a6af02806566d16274de" integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg== diff --git a/dojo/templates/base.html b/dojo/templates/base.html index 765ec10dc55..3bfcb08d24a 100644 --- a/dojo/templates/base.html +++ b/dojo/templates/base.html @@ -46,7 +46,7 @@ - + @@ -87,7 +87,7 @@ {% block dojo_css %} {% endblock %} - + {% comment %} {% endcomment %}