Merge remote-tracking branch 'upstream/r/11.x' into wwu/11
* upstream/r/11.x: Review Fixes Fix Admin UI builds due to missing SASS Patch Issue #1967, Admin-ui-frontend migrate node-sass to sass as recommended on node-sass project site, updated scss files to support sass Adding note to 10.x upgrade doc regarding 10.3's changed activemq config file Fix wrong name of admin UI configuration file (#3532) Force same sample rate for audio files in PartialImport WOH encoding profiles missing changes from pr#3107 Improve Tooltips in Documentation Allow index name to be changed at runtime Elasticsearch index retry configuration
Showing
- docs/guides/admin/docs/configuration/elasticsearch.md 10 additions, 2 deletionsdocs/guides/admin/docs/configuration/elasticsearch.md
- docs/guides/admin/docs/css/extra.css 11 additions, 0 deletionsdocs/guides/admin/docs/css/extra.css
- docs/guides/admin/docs/javascript/extra.js 16 additions, 0 deletionsdocs/guides/admin/docs/javascript/extra.js
- docs/guides/admin/docs/javascript/popper.js 6 additions, 0 deletionsdocs/guides/admin/docs/javascript/popper.js
- docs/guides/admin/docs/javascript/tippy.js 2 additions, 0 deletionsdocs/guides/admin/docs/javascript/tippy.js
- docs/guides/admin/docs/releasenotes/elasticsearch-retry-config.txt 6 additions, 0 deletions...es/admin/docs/releasenotes/elasticsearch-retry-config.txt
- docs/guides/admin/docs/workflowoperationhandlers/partial-import-woh.md 2 additions, 2 deletions...dmin/docs/workflowoperationhandlers/partial-import-woh.md
- docs/guides/admin/mkdocs.yml 2 additions, 0 deletionsdocs/guides/admin/mkdocs.yml
- etc/org.opencastproject.adminui.impl.AdminUIConfiguration.cfg 0 additions, 0 deletions...org.opencastproject.adminui.impl.AdminUIConfiguration.cfg
- etc/org.opencastproject.elasticsearch.index.ElasticsearchIndex.cfg 21 additions, 0 deletions...pencastproject.elasticsearch.index.ElasticsearchIndex.cfg
- modules/admin-ui-frontend/Gruntfile.js 1 addition, 1 deletionmodules/admin-ui-frontend/Gruntfile.js
- modules/admin-ui-frontend/app/styles/base/fontawesome/_fixed-width.scss 1 addition, 1 deletion...ui-frontend/app/styles/base/fontawesome/_fixed-width.scss
- modules/admin-ui-frontend/app/styles/base/fontawesome/_larger.scss 2 additions, 2 deletions...dmin-ui-frontend/app/styles/base/fontawesome/_larger.scss
- modules/admin-ui-frontend/app/styles/base/fontawesome/_list.scss 2 additions, 2 deletions.../admin-ui-frontend/app/styles/base/fontawesome/_list.scss
- modules/admin-ui-frontend/app/styles/base/fontawesome/_variables.scss 1 addition, 1 deletion...n-ui-frontend/app/styles/base/fontawesome/_variables.scss
- modules/admin-ui-frontend/app/styles/components/_popover.scss 2 additions, 2 deletions...les/admin-ui-frontend/app/styles/components/_popover.scss
- modules/admin-ui-frontend/app/styles/components/_stats.scss 1 addition, 1 deletionmodules/admin-ui-frontend/app/styles/components/_stats.scss
- modules/admin-ui-frontend/app/styles/components/modals/_modal-base.scss 2 additions, 2 deletions...ui-frontend/app/styles/components/modals/_modal-base.scss
- modules/admin-ui-frontend/app/styles/components/modals/_nav.scss 1 addition, 1 deletion.../admin-ui-frontend/app/styles/components/modals/_nav.scss
- modules/admin-ui-frontend/app/styles/components/video/_video-editor.scss 7 additions, 7 deletions...i-frontend/app/styles/components/video/_video-editor.scss
Loading
Please register or sign in to comment