seek4science / seek

80%

master: 60%

LAST BUILD ON BRANCH samples-master-merge

branch: samples-master-merge

CHANGE BRANCH

x

Reset

• samples-master-merge
• 1.3-sqlite3
• 404-error
• HITS-SDBV-preview_for_search-pr
• OPSK-1275
• OPSK-1287
• OPSK-1292
• OPSK-1293
• OPSK-1299
• OPSK-1301
• OPSK-1301-rebase
• OPSK-1340
• OPSK-1441
• OPSK-1494
• OPSK-1514
• OPSK-1539
• OPSK-1540
• OPSK-1552
• OPSK-417
• OPSK-456
• OPSK-485
• OPSK-485-2
• OPSK-507
• OPSK-522
• OPSK-535
• OPSK-550
• OPSK-571-attempt
• OPSK-589
• OPSK-591
• OPSK-594
• OPSK-608
• OPSK-669
• OPSK-701
• OPSK-703
• OPSK-708
• OPSK-725
• OPSK-956
• OSPK-1511
• SynthSys-defaultPerms
• ability-refactor
• accessor_name
• admin-can-remove-from-project
• admin-redesign
• ams-api
• asset_report_bug
• association-filtering
• association-forms-refactor
• async-samples-extraction
• auth-improvements
• auth-inconsistency
• auth-options
• avatar-image-size
• avatar-tweaks
• bioruby-151
• biovel-config
• bug-fixes
• bugfixes
• button
• button2
• cancel_buttons
• cherry-pick-tab-memory
• citations
• closing-files
• codeclimate-exclude
• content-blob-indexing
• create_project_button_bug
• current_user_in_controllers
• cytoscape_update
• default-license
• delete-samples-with-df
• devise
• disable-net
• docker
• docker-fun
• docker-messing
• docker-mysql-tweaks
• docker-none-root
• documents
• doi-query-tool-update
• doi-simplifying
• doi-usability
• download-refactoring
• encrypted-settings
• external-service-errors
• faceted_browsing_improvement
• faceted_improvement_for_1_1
• factory-split
• fairdom-id
• fairdomhub
• fairdomhub-1.1
• fairdomhub-1.2
• fairdomhub-1.3
• fairdomhub-1.4
• feed-date
• fix-html-problem
• fix-project-link
• fixes
• ftp
• full-test-suite
• full-testing
• gems
• gems2
• git-tag
• github-in-gemfile
• header-image-bug
• help-links
• host_config
• investigation-publishing
• investigation-snapshots
• investigation-snapshots-rostock
• isa-graph
• isa-graph-heirarchy
• isa-publishing
• isa-snapshots
• isa-text-size
• isa-tree-fix
• isa_graph_issue
• isa_graph_menu_problem
• javascript_test
• jena-problem
• jerm2
• js-testing
• json
• jws-constraint-based
• left_project
• licenses
• load-issues
• mandatory-orcid
• master
• master-merge
• master-random-order
• merge-0.23
• merge-0.23-2
• merge-organisms
• merge-seek-0.23
• minitest-reporting
• minor-refactoring
• model-types-sync
• multi-file-data-files
• multi-file-data-files2
• multi_line_cytoscape
• nels-integration
• new-datafile-upload
• new-front-page
• new-player
• new-units
• newer-rubies-test
• nil_ncbi
• old-sample-configs
• old-samples-rake-task
• openbis-cache
• openbis-error-handling
• openbis-integration
• openbis-mocking
• openbis-sprint1
• opsk-1016
• opsk-1017
• opsk-1037
• opsk-1126
• opsk-1163
• opsk-1191
• opsk-1232
• opsk-1235
• opsk-1359
• opsk-1393
• opsk-1407
• opsk-1414
• opsk-1415
• opsk-1452
• opsk-1458
• opsk-1464
• opsk-1466
• opsk-1488
• opsk-1489
• opsk-1493
• opsk-1583
• opsk-1587
• opsk-1638
• opsk-420
• opsk-629
• opsk-630
• opsk-634
• opsk-676
• opsk-776
• opsk-808
• opsk-841
• opsk-857
• opsk-866
• opsk-903
• opsk-911
• opsk-918
• opsk-922
• opsk-925
• opsk-928
• opsk-937
• opsk-958
• opsk-959
• opsk-963
• opsk-968
• opsk-977
• opsk-978
• orcid-in-xml
• organisms-improvements
• organisms-index
• origin/seek-publications
• paperclip-gem
• pb-jstree
• permissions-ui
• positions-and-roles
• postgres-problem
• profile-editing
• programme-admin-issues
• programme-manager
• programme-manager2
• programme-manager3
• programme-manager4
• programme-notify
• programme-search
• programme_proj_admininstrator
• project-administrator
• project-associations
• project-browser
• project-leaving-job
• project-sharing
• project-specific-config
• publishing-refactoring
• rails-update
• rails4
• rails4.2
• rails4.2-bundle-update
• rdf-bi-directional
• rdf-classloading-problem
• rdf-sync-fixes
• rdf-tweak
• readAPI
• readAPI-fixes
• readWriteAPI
• readWriteApi
• redbox-cleanup
• refactor
• refactoring
• registration_workflow
• registration_workflow2
• registration_workflow3
• registration_workflow4
• registration_workflow5
• remote-content
• remove-forums
• remove-join-table
• remove-project-roles
• remove_openid
• resolvable-cb-json
• revert-subscription-auth
• ro-fix
• roar-json
• role-renaming
• roles-refactoring
• roles-refactoring2
• roles-refactoring3
• rubocop
• rubocop-factories
• rubocop-factory
• rubocop-hash
• ruby-2.1.7
• ruby-2.1.8
• ruby-2.2.8
• ruby-2.4
• ruby222
• sample-attribute-type-inheritance-test
• sample-attribute-types
• sample-attribute-units
• sample-attribute-validation
• sample-attributes
• sample-bug-fixes
• sample-cv-management
• sample-dep2
• sample-deprecation
• sample-enhancements
• sample-grouping
• sample-instantiation
• sample-join-table
• sample-pag
• sample-profiling
• sample-snapshot-bug
• sample-sqlite-problem
• sample-sqlite-problem2
• sample-strain-errors
• sample-template-tidying
• sample-templates-with-metadata
• sample-type-classification
• sample-type-tags
• sample-types
• sample-types-samples
• sample_data_object
• sample_type_searching
• samples
• samples-and-assays
• samples-association
• samples-boolean
• samples-controlled-vocab
• samples-cv-finishing-off
• samples-cv-ui
• samples-cv-ui2
• samples-finishing
• samples-fixes
• samples-from-template
• samples-full-test-suite
• samples-graph
• samples-isa-graph
• samples-perf
• samples-projects-and-auth
• samples-search
• samples-sqlite3
• samples_xml
• sandbox_seed
• seed-bank
• seek-0.21
• seek-0.22
• seek-0.23
• seek-1.0
• seek-1.0.0
• seek-1.1
• seek-1.2
• seek-1.3
• seek-1.4
• seek-1.4-full-test-suite
• seek-1.4-merged
• seek-1.5
• seek-1.5-workflow-fixes
• seek-1.5_1425
• seek-1.5_definitions
• seek-roar
• seek_doi
• settings-cache
• sharing-scope-removal
• sharing-scope-reset
• slideshare
• spec-reporter
• sqlite-test-prob
• storage-stats-bug
• storage-usage
• stuart-mini-tasks
• stuart-readWriteApi
• stuarts_stuff
• subscription-auth-fix
• swagger
• synbiochem-demo
• teaspoon-longer-delay
• template-generation
• throttling
• tooltips
• travis-bundler-test
• tsv-issue
• units-order
• unsupported-head-requests
• url-schemes
• v0.21.0
• v0.22.0
• v0.22.1
• v0.23.0
• v1.0.0
• v1.0.1
• v1.0.2
• v1.0.3
• v1.1.0
• v1.1.1
• v1.1.2
• v1.2.0
• v1.2.1
• v1.2.2
• v1.2.3
• v1.3.0
• v1.3.1
• v1.3.2
• v1.3.3
• v1.4.0
• v1.4.1
• v1.5.0
• v1.5.1
• v1.5.2
• validate-prog-url
• welcome-text-update
• workflow-removal
• write

Merge branch 'master' into samples-master-merge

Conflicts:
	app/assets/javascripts/application.js
	app/helpers/biosamples_helper.rb