Commits

Mateusz Matela authored 79087919f5cM
Merge branch '6.3' into rcin Conflicts: app/ARiA.launch app/base/src/java/pl/psnc/dlibra/app/gui/common/metadataassist/AutoCompleteTextArea.java app/base/src/java/pl/psnc/dlibra/app/gui/common/metadataassist/MetadataAssistTextArea.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/AttributesValuesModel.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/assist/person/PersonPanel.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributeValueCellEditor.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributeValueTableCellRenderer.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributeValueValueAdapter.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/AttributesValuesTreeTable.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/PersonAttributeValueAdapter.java app/base/src/java/pl/psnc/dlibra/app/gui/editor/attributesvalueseditor/treetable/SetAutocompleteValuesRunnable.java app/cache/src/java/pl/psnc/dlibra/cache/metadata/CachedAttributeValueManager.java extensions/app/ds-url/src/java/pl/psnc/dlibra/app/extension/dsurl/URLDataSource.java extensions/app/ds-url/src/java/pl/psnc/dlibra/app/extension/dsurl/URLInputPanel.java extensions/app/ds-url/src/java/pl/psnc/dlibra/app/extension/dsurl/URLPublicationHandler.java extensions/app/ds-url/src/java/pl/psnc/dlibra/app/extension/dsurl/res/GUI.properties extensions/app/ds-url/src/java/pl/psnc/dlibra/app/extension/dsurl/res/GUI_en.properties extensions/app/ds-url/src/java/pl/psnc/dlibra/app/extension/dsurl/res/GUI_pl.properties extensions/app/ma-geolocation/src/etc/plugin.xml extensions/project.properties extensions/server/tce-url/src/java/pl/psnc/dlibra/content/extraction/URLTextualContentExtractor.java project.properties server/SERVER.launch server/index/src/java/pl/psnc/dlibra/index/ElementSolrIndexer.java server/metadata/src/java/pl/psnc/dlibra/metadata/server/AttributeValueManagerImpl.java webapp/base/src/assets/frontend/js/scripts/PublicationComponent.js webapp/base/src/etc/web.xml webapp/base/src/webapp/WEB-INF/components.xml webapp/base/src/webapp/style/dlibra/default/js/main.min.js webapp/components/src/java/pl/psnc/dlibra/web/comp/content/EditionContent.java webapp/components/src/java/pl/psnc/dlibra/web/comp/pages/components/AbstractMetadataComponent.java webapp/components/src/java/pl/psnc/dlibra/web/comp/pages/components/ContentBrowserComponent.java webapp/components/src/java/pl/psnc/dlibra/web/comp/stats/StatisticsServlet.java webapp/components/src/java/pl/psnc/dlibra/web/comp/utils/ExternalContentUtils.java webapp/components/src/java/pl/psnc/dlibra/web/comp/utils/pages/ContentUrlBuilder.java webapp/components/src/resources/components/templates/ContentBrowserComponent.vm webapp/components/src/resources/components/templates/PublicationComponent.vm
Showing diff to3e020b51df7