# Conflicts:
#	openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/GlobalSearchTest.java
#	openbis/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchSampleTest.java
#	openbis_api/sourceTest/java/ch/ethz/sis/openbis/generic/sharedapi/v3/dictionary.txt

SSDM-9648: using searchCriteria.withCode().thatIsGreaterThan(). test case with chunks of same timestamp

SSDM-9845 Refactored out FetchOptions from IGlobalSearchManager and other classes where it should not be. Removed registrator from full text search results, as it is relevant only for V1 API.

This reverts commit a7f61959.

This reverts commit 67b753bf.

This reverts commit 60db9b17.

NG_UI : SSDM-7583 : ObjectType form - fix automated tests after introduction of 'view' and 'edit' modes

NG_UI : content tabs : show '*' in a content tab also for type creation (btw. simplify content tabs)

NG_UI : SSDM-7583 : ObjectType form - when creating a new type show the form in 'edit' mode without 'Cancel' button (btw. refactor the strategies to make it cleaner)

NG_UI : dialogs : extract a common Message component and use it to show a warning icon in the confirmation dialogs

NG_UI : SSDM-7583 : ObjectType form - show a warning dialog before closing a tab or cancelling a form when there are unsaved changes

SSDM-9368: new database schema 181 with new columns parent_annotations and child_annotations for sample_relationships_all. also annotations column for sample_relationships_history