Commit graph

424 commits

Author SHA1 Message Date
Urban Rotnik 82ea31e275 Add validation limits for system notification fields 2019-02-20 16:05:15 +01:00
Urban Rotnik 7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
aignatov-bio fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications
Features/system notifications
2019-02-19 13:51:18 +01:00
Urban Rotnik f7c7335bf0 Change test to pass on Travis 2019-02-19 11:23:01 +01:00
Urban Rotnik f63eaaefe7 Add user_system_notification records when syncing notifications, update email sending 2019-02-19 11:22:58 +01:00
Urban Rotnik 29d77ca81d Add system_notification sending email feature 2019-02-19 11:20:25 +01:00
aignatov-bio 8e905b67b2
System notification navbar menu drop down [SCI 2955] (#1498)
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
2019-02-19 11:08:59 +01:00
Alex Kriuchykhin 185e3b4832
Merge pull request #1495 from okriuchykhin/ok_SCI_3039
Create templates project when syncing templates if team doesn't have it [SCI-3039]
2019-02-14 17:40:01 +01:00
Urban Rotnik 5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik 9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin da30d187a6 Create templates project when syncing templates if team doesn't have it [SCI-3039] 2019-02-13 15:17:33 +01:00
mlorb 71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +01:00
Mojca Lorber 0adb8b2b61 Fix failing tests 2019-02-13 14:31:26 +01:00
Mojca Lorber 5825c7120d fix falling test 2019-02-13 11:49:01 +01:00
Alex Kriuchykhin b71c9d96a2
Merge pull request #1476 from okriuchykhin/ok_SCI_2944
Add test for templates service [SCI-2944]
2019-02-12 09:39:03 +01:00
Oleksii Kriuchykhin acbbc1a9f8 Add comment [SCI-2944] 2019-02-11 13:40:25 +01:00
Oleksii Kriuchykhin 92b47a3034 Remove unneeded ordering [SCI-2967] 2019-02-07 11:23:40 +01:00
Jure Grabnar c5780927a8 Change a test to work with multiple tests run at the same time 2019-02-06 22:07:54 +01:00
Jure Grabnar 6ae82401f3 Add test experiment.json file 2019-02-06 21:06:56 +01:00
Jure Grabnar 0fa403d6b0 Refactor tests fro experiment import
Closes [SCI-2946]
2019-02-06 14:27:43 +01:00
Jure Grabnar 55fdd201b2 Add additional checks 2019-02-05 14:27:42 +01:00
Jure Grabnar 0a3146fbe6 Add checking of experiment basics 2019-02-05 14:27:42 +01:00
Jure Grabnar e180d5e100 Add test skeleton for importing 2019-02-05 14:27:42 +01:00
Oleksii Kriuchykhin 79c7bbbfb0 Fix failing tests with local file storage [SCI-2944] 2019-02-04 13:50:38 +01:00
Oleksii Kriuchykhin 19f1585352 Add test for templates service [SCI-2944] 2019-02-01 18:06:36 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Urban Rotnik 6f7fcb0831 Refactor method clone_experiment_as_template into service object
[SCI-2925]
2019-01-31 07:13:40 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
2019-01-29 11:40:26 +01:00
Urban Rotnik 4cf12d12d1 Refactor 'move_experiment' method into service object
Jira Ticket: SCI-2926
2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin 05edfae766 Fix failing tests [SCI-2939] 2019-01-25 14:13:00 +01:00
Urban Rotnik 247bae8a9f Refactor export_all_counter increasing/reseting logic
- Remove daily task
- Add method to user Model
2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Urban Rotnik f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik b41dc0a4d5 Specs for workflow_image_fenerator
fix SCI-2924
2019-01-18 16:56:33 +01:00
Urban Rotnik d738169120 Refactor FactoryBot factories 2019-01-18 16:56:33 +01:00
Urban Rotnik 47cc6a9d10 Refactor workflow_image_generation and move to service class 2019-01-18 16:56:33 +01:00
Alex Kriuchykhin c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
2019-01-10 11:05:07 +01:00
Oleksii Kriuchykhin 6a64b23f90 Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888] 2019-01-04 10:44:38 +01:00
Oleksii Kriuchykhin 311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Jure Grabnar 13bc664902
Merge pull request #1367 from jbargu/jg_2746_health_unit_tests
Add unit tests for status/health API endpoints
2018-11-19 13:14:38 +01:00
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master'
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
2018-11-14 16:59:04 +01:00
Jure Grabnar 7a320ae031 Update formating according to Hound 2018-11-12 17:51:23 +01:00
Jure Grabnar 1c08aa6a8b Add unit tests for status/health API endpoints
Closes [SCI-2746].
2018-11-12 17:17:47 +01:00
Oleksii Kriuchykhin 23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin 30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Matej Zrimšek 2f6a6072e1 Fix repository ZIP export test to work with enabled workers [SCI-2646] 2018-11-07 06:14:40 +01:00
Matej Zrimšek 8fe0249f45 Fix test for repository ZIP export & return path for ZIP exports [SCI-2646] 2018-11-07 05:04:29 +01:00
Alex Kriuchykhin b2f87561fe
Merge pull request #1335 from okriuchykhin/ok_SCI_2749
Add tests for CREATE Result endpoint [SCI-2749]
2018-10-30 09:43:45 +01:00
Alex Kriuchykhin 2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
2018-10-29 16:26:58 +01:00
Oleksii Kriuchykhin 04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +01:00
Matej Zrimšek 4bb05040d6 Fix tests for project controller to work with changed code [SCI-2732] 2018-10-23 22:24:57 +02:00
Matej Zrimšek 17712f5142 Minor tests refactoring [SCI-2732] 2018-10-23 22:24:57 +02:00
Matej Zrimšek 98009939d1 Fix tests for project services to work with changed code [SCI-2732] 2018-10-23 22:24:57 +02:00
Matej Zrimšek 1c43077a5e Add visibility check to tests (redundant in most cases, but safer) [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek 173ebdcf87 Fix some tests wich falsely passed locally; Some description refactoring [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek 1be952fdbb Fix context block for ProjectsOverviewService#projects_datatable test with { filter: 'archived' } parameter 2018-10-23 19:51:50 +02:00
Matej Zrimšek 4bf1d904b7 Add project controller unit tests [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek e5129160fe Use the previous way of handling request params in rspec [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek d9281b66d5 Add test for sorting by column and order for ProjectsOverviewService#projects_datatable 2018-10-23 19:51:50 +02:00
Matej Zrimšek 5ea4a2ced3 Refactor ProjectsOverviewService tests to be request parameter friendly and hence more readable 2018-10-23 19:51:50 +02:00
Matej Zrimšek b982ffe7c8 Improve & refactor #project_cards, add #projects_datatable tests for ProjectsOverviewService 2018-10-23 19:51:50 +02:00
Matej Zrimšek 2794f75215 Add ProjectsOverviewService#project_cards unit tests 2018-10-23 19:50:06 +02:00
Oleksii Kriuchykhin b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin 95cb6db4df Fix test [SCI-2733] 2018-10-19 10:47:55 +02:00
Oleksii Kriuchykhin c2e36580ce Add tests for CREATE Result endpoint [SCI-2749] 2018-10-17 14:17:16 +02:00
Alex Kriuchykhin 18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772
Implement inventory column data type name mappings [SCI-2772]
2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin b833ff6616 Rename MyModule serializer in tests [SCI-2742] 2018-10-16 17:45:29 +02:00
Oleksii Kriuchykhin e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Jure Grabnar d50f56e319 Disable/enable export proejct button
Fix filesystem saving
2018-10-16 11:01:58 +02:00
Oleksii Kriuchykhin 0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +02:00
Luka Murn 1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
2018-10-15 15:20:26 +02:00
Oleksii Kriuchykhin dd17f1d5ad Add project READ endpoints [SCI-2742] 2018-10-12 17:43:36 +02:00
Luka Murn 2b7a94025e
Merge pull request #1320 from biosistemika/lm-mc-sci-2697
UPDATE Inventory item endpoint - unit tests [SCI-2697] (v2)
2018-10-11 15:20:37 +02:00
Luka Murn 028c0c6832 Remove 2 obsolete unit tests 2018-10-11 14:41:13 +02:00
Luka Murn 33b9c65c29 Fix Hound 2018-10-11 14:27:52 +02:00
Luka Murn 1e46631c02
Merge pull request #1316 from czbiohub/mc-SCI-2700
close sci-2700; add unit tests for inventory column update [SCI-2700]
2018-10-11 10:20:15 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin 77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn a8d56d32e2 Hound is love, Hound is life 2018-10-07 13:28:29 +02:00
Luka Murn 0bd3c81e39 Fix /users, /users/:id/identities endpoints 2018-10-07 13:07:27 +02:00
Luka Murn d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn 6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Luka Murn 7b5a65416a Update status endpoint 2018-10-06 11:47:23 +02:00
Oleksii Kriuchykhin ed7c88f94d Improve tests [SCI-2741] 2018-10-04 12:00:50 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Luka Murn 2dc09f080d Revert "Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api""
This reverts commit 7ef85a9b60.
2018-10-01 14:59:06 +02:00
Luka Murn 7ef85a9b60 Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api"
This reverts commit 870dda255c, reversing
changes made to 2ac6563730.
2018-10-01 14:41:18 +02:00
Luka Murn 548cfb65e1 Merge branch 'mc-SCI-2704' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2704
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
2018-10-01 11:53:47 +02:00
Luka Murn bf59276afd Merge branch 'mc-SC-2703' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2703
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
2018-10-01 11:41:29 +02:00
Luka Murn 870dda255c Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
2018-10-01 09:20:58 +02:00
Luka Murn 2ac6563730
Merge pull request #1295 from czbiohub/mc-SCI-2702
close SCI-2702; unit tests for create inventory [SCI-2702]
2018-10-01 09:08:39 +02:00
Michael 2f99904000 merge core-api and handle merge issues 2018-09-27 10:43:52 -07:00
Michael 088e06cae7 fix check to inventory 2018-09-26 10:47:13 -07:00
Luka Murn 07c8c448d5 Fix codestyle 2018-09-26 18:30:07 +02:00
Luka Murn 46883150d1 Merge branch 'mc-SCI-2696' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2696
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
2018-09-26 18:16:25 +02:00
Luka Murn d0d0939afd Move @valid_headers content type to global @valid_headers def 2018-09-26 18:13:10 +02:00
Luka Murn 39dafd2179 Merge branch 'mc-SC-2701' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2701
Conflicts:
	spec/requests/api/v1/inventory_columns_controller_spec.rb
2018-09-24 16:40:44 +02:00
Oleksii Kriuchykhin 49e788a9ad Mergre latest core-api [SCI-2515] 2018-09-14 10:24:05 +02:00
Luka Murn 3b3d682ab2
Merge pull request #1294 from czbiohub/mc-SCI-2699
add unit tests for Create inventory_column endpoint [SCI-2699]
2018-09-12 15:39:18 +02:00
Luka Murn 8e376a0293 Hound is love, Hound is life. 2018-09-12 13:47:52 +02:00
Luka Murn 0b68a670c2 Fix the inventory_columns_controller#create action
Based on unit tests, fix the create inventory columns endpoint
to work as intended. Also add another unit test case.
2018-09-12 13:44:10 +02:00
Michael 9fab092c31 remove funky symbol 2018-09-11 09:55:38 -07:00
Michael 4b41cc9566 close mc-SC-2703; unit tests for DELETE inventory endpoints 2018-09-09 14:58:56 -07:00
Michael f9f9bcac9f same changes to update unite tests 2018-09-09 14:03:56 -07:00
Michael 849a147756 failing tests for update, to_i doesn't work with updated changes 2018-09-09 14:02:22 -07:00
Michael beff430b61 unit tests for DELETE inventory [SCI-2704] 2018-09-09 13:37:26 -07:00
Michael e2c10e973d close mc-SC-2701; DELETE inventory column endpoint unit tests 2018-09-09 13:15:54 -07:00
Michael 43a3c1c06b close SCI-2702; unit tests for create inventory 2018-09-09 13:02:42 -07:00
Michael 436876ad76 close SCI-2699; add unit tests for Create inventory_column endpoint 2018-09-09 00:15:56 -07:00
Michael c0f0f0ea81 close SCI-2698; unit tests for DELETE inventory item 2018-09-07 15:11:53 -07:00
Michael 212bdfeffe close SCI-2696 2018-09-06 17:54:24 -07:00
Michael c22ad02858 inventory_item #create correct response unit test 2018-09-06 13:45:28 -07:00
Alex Kriuchykhin 18dfeb537b
Merge pull request #1269 from okriuchykhin/ok_SCI_2604
Improve health check endpoint [SCI-2604]
2018-08-24 16:55:47 +02:00
Oleksii Kriuchykhin c86063f79e Fix failing tests [SCI-2688] 2018-08-24 15:48:49 +02:00
Oleksii Kriuchykhin afef8bc0b1 Fix failing tests [SCI-2687] 2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin 5488fc66fc Refactor JSON API mime type registration [SCI-2687] 2018-08-24 15:37:23 +02:00
Oleksii Kriuchykhin c8abb3d9b8 Add user_identities CRUD endpoints, make API V1 togglable [SCI-2664][SCI-2686] 2018-08-24 15:27:59 +02:00
Alex Kriuchykhin eb2d3e7951
Merge pull request #1276 from okriuchykhin/ok_SCI_2613
Add READ user endpoint [SCI-2613]
2018-08-24 15:23:05 +02:00
Oleksii Kriuchykhin 0322316d74 Make API V1 togglable [SCI-2686] 2018-08-24 12:11:28 +02:00
Oleksii Kriuchykhin a8013118d4 Add READ user endpoint [SCI-2613] 2018-08-21 13:56:14 +02:00
Oleksii Kriuchykhin 1a57289009 Improve health check endpoint [SCI-2604] 2018-08-17 16:13:21 +02:00
Oleksii Kriuchykhin 8df6ebb5f2 Remove test for old api token endpoint [SCI-2515] 2018-08-17 14:14:18 +02:00
Oleksii Kriuchykhin ef7e0ac489 Add GET inventory columns API endpoint [SCI-2615] 2018-08-08 17:31:37 +02:00
Oleksii Kriuchykhin 6c59e1e159 Fix failing tests [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin 4df9a4c9ca Fix code style warnings [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin 8d11e03d47 Add read inventories and inventory items endpoints [SCI-2614][SCI-2616][SCI-2617] 2018-08-08 17:01:49 +02:00
Oleksii Kriuchykhin dc2411c5ed Fix Hound warnings [SCI-2611][SCI-2612] 2018-08-08 16:27:43 +02:00
Oleksii Kriuchykhin 298b866df4 Fix failing tests [SCI-2611][SCI-2612] 2018-08-07 14:58:02 +02:00
Oleksii Kriuchykhin 22e12d8fc3 Add GET teams and team API endpoints [SCI-2611][SCI-2612] 2018-07-31 13:40:27 +02:00
Oleksii Kriuchykhin 26b0bd9e11 Refactor tasks tree API endpoint [SCI-2609] 2018-07-30 14:48:11 +02:00
Zmago Devetak 147e74b4a5
Merge pull request #1164 from ZmagoD/zd_SCI_2448
adds discard gem, move deletion of repositories in a rake task to run…
2018-05-28 15:04:54 +02:00
zmagod c683cfdbd7 triggers the delayed job in the controller action, fixes smart annotations 2018-05-25 11:41:43 +02:00
zmagod ba2aafae39 fix access to public reports [fixes SCI-2340] 2018-05-21 14:45:18 +02:00
Zmago Devetak 8a92f1a499
Merge pull request #1127 from ZmagoD/zd_SCI_2307_v3
Adds custom method that generates smart annotations name for repository
2018-05-16 13:23:25 +02:00
zmagod 69783cb73e removes unneeded spec 2018-05-16 12:11:18 +02:00
Luka Murn 38f4d0524f Add spec for sequential creations and deletes
Closes SCI-2320.
2018-05-15 20:44:15 +02:00
Luka Murn b29cde4414 Add repository table state column update service spec
Include both service methods. There remains some additional tests
that should be written.
2018-05-15 20:44:15 +02:00
Luka Murn 9e106acf73 Add spec for repository_table_state_service 2018-05-15 20:44:15 +02:00
Luka Murn 611a25ca9f Minor change in existing spec to user the service 2018-05-15 20:44:15 +02:00
Luka Murn 6218907d31 Add blank, initial files 2018-05-15 20:44:15 +02:00
zmagod 3e10ff7fc5 add custom method that generates smart annotations name from repository name [fixes SCI-2307] 2018-05-04 10:44:23 +02:00
Zmago Devetak d744f24b85
Merge pull request #1118 from ZmagoD/zd_SCI_2323
sign_out user after 7 days [fixes SCI-2323]
2018-05-03 14:36:44 +02:00
Zmago Devetak 9ce071693d
Merge pull request #1116 from ZmagoD/zd_SCI_2310
parse smart annotations in repository export [fixes SCI-2310]
2018-05-03 14:34:29 +02:00
zmagod e9642cadad Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2304 2018-04-26 14:26:30 +02:00
zmagod 589389fa8e fixex failing specs 2018-04-25 11:00:22 +02:00
zmagod 7d26ce561c parse smart annotations in repository export [fixes SCI-2310] 2018-04-24 14:53:49 +02:00
Zmago Devetak 1e4a975304
Merge pull request #1113 from ZmagoD/zd_SCI_2307_v2
rename smart annotations icons [fixes SCI-2307]
2018-04-24 10:11:30 +02:00
zmagod 3431ab2da3 fix failing spec 2018-04-24 09:53:26 +02:00
zmagod de6c40a921 fix failing specs 2018-04-24 09:47:16 +02:00
zmagod f56f457c78 fixes failing specs 2018-04-23 13:34:56 +02:00
zmagod dafa29d4bf Merge branch 'ux-release-1' of https://github.com/biosistemika/scinote-web into zd_SCI_2124 2018-04-20 10:33:15 +02:00
Zmago Devetak 6b4d786acc
Merge pull request #1105 from ZmagoD/zd_SCI_2307
change repository icon
2018-04-19 17:58:48 +02:00
zmagod ec5a8336b9 fixes failing spec 2018-04-19 17:46:44 +02:00
Zmago Devetak 93fc1af12d
Merge pull request #1083 from ZmagoD/zd_SCI_2259
set limit on maximum number of dropdown list items [fixes SCI-2259]
2018-04-19 17:17:54 +02:00
Zmago Devetak 1290435372
Merge pull request #1086 from ZmagoD/zd_SCI_2207
enables copying of repository items [fixes SCI-2207]
2018-04-19 17:13:43 +02:00
zmagod c23eacfe13 fixes for_admin action/ test visible_by functlion 2018-04-19 12:41:00 +02:00
zmagod 9d282d1800 adds new reports index page [fixes SCI-2124] 2018-04-18 16:47:52 +02:00
zmagod 4f21833373 changes per @duco 's request 2018-04-13 11:47:33 +02:00
zmagod cebb06269b refactor specs 2018-04-12 13:34:34 +02:00
Luka Murn 9bf8b5d864 Merge branch 'ok_SCI_1860' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_1860
Conflicts:
	Makefile
	app/assets/javascripts/projects/index.js.erb
	app/assets/stylesheets/themes/scinote.scss
	config/locales/en.yml
2018-04-12 13:16:46 +02:00
zmagod 7f93cf6220 adds specs for duplicate class 2018-04-12 13:00:21 +02:00
zmagod 6291857bbf enables copying of repository items [fixes SCI-2207] 2018-04-11 17:17:19 +02:00
zmagod e4b49e62a3 fixes import limit 2018-04-10 15:45:51 +02:00
zmagod b12f6f1b92 set limit on maximum number of dropdown list items [fixes SCI-2259] 2018-04-09 12:50:25 +02:00
Zmago Devetak d1f3a65279
Merge pull request #1073 from ZmagoD/zd_SCI_2206
add ID column to repository [fixes SCI-2206]
2018-04-04 15:39:59 +02:00
zmagod 6e255a4657 fixes failing specs 2018-04-04 14:44:32 +02:00
zmagod 659a088058 refactor smart annotation parser, adds repository item to smart annotation parser [fixes SCI-2222] 2018-03-29 15:55:26 +02:00
Zmago Devetak 75d7ace8c7
Merge pull request #1017 from ZmagoD/zd_SCI_2068
Write server-side endpoints for custom repositories [SCI-2068]
2018-03-20 14:30:47 +01:00
Oleksii Kriuchykhin a105e61d48 Remove tutorial [SCI-1860] 2018-03-18 13:18:05 +01:00
zmagod 1cdba5e0d3 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2068 2018-03-16 11:05:16 +01:00
zmagod c2eb6d6900 fixes hound adds specs to repository_list_items controller 2018-03-16 10:53:05 +01:00
zmagod d69754af04 implement search on list items dropdown, update, create actions [fixes SCI-2070] 2018-03-15 15:43:16 +01:00
zmagod b67a54e2d1 Merge branch 'samples_to_repositories_table_migration' of https://github.com/biosistemika/scinote-web into zd_SCI_2024_fix_custom_repositores_import 2018-03-13 15:25:57 +01:00
zmagod 3957c4c54c fix failing spec 2018-03-13 15:03:48 +01:00
okriuchykhin 503617b42c
Merge branch 'samples_to_repositories_table_migration' into zd_SCI_2025 2018-03-13 14:44:20 +01:00
zmagod 32d2d218ba fix failing specs 2018-03-13 11:24:16 +01:00
mlorb 3b9ad2f86f
Merge pull request #1028 from mlorb/ml-sci-2144
Add file custom column type to db [SCI-2144]
2018-03-12 15:18:02 +01:00
mlorb 34f5c2c7ac fix validation in asset model and change formatted method in repository_asset_value model 2018-03-12 10:50:45 +01:00
Zmago Devetak d50bc5fde9
Merge pull request #998 from ZmagoD/zd_SCI_2014
migration script for migrating samples -> custom repositories [SCI-2014]
2018-03-09 17:19:12 +01:00
mlorb 64e26e1c60 add file custom column type to db 2018-03-09 17:04:54 +01:00
zmagod 26c5c8bf46 fix failing test 2018-03-09 16:59:17 +01:00
zmagod 22eb4121f0 follow @okriuchykhin 's suggestions 2018-03-09 15:44:42 +01:00
zmagod 0baa7a1f99 fix hound 2018-03-09 14:43:12 +01:00
zmagod 4f951f6679 adds unit specs for datatable service [fixes SCI-2068] 2018-03-09 14:22:00 +01:00
zmagod fb66131e29 setup endpoint for repository_rows paging/search 2018-03-06 16:32:39 +01:00
zmagod fca01bd54f refactor repository export [fixes SCI-2025] 2018-03-05 15:54:04 +01:00
Zmago Devetak 50ccec5007
Merge pull request #1009 from ZmagoD/zd_SCI_2066
add info modal for repository items [fixes SCI-2066]
2018-03-05 12:49:29 +01:00
zmagod 0996745781 refactor repository import, adds RepositoryListType as an option and makes the import class more extensible [fixes SCI-2024] 2018-03-02 13:39:22 +01:00
zmagod e3ca782996 add info modal for repository items [fixes SCI-2066] 2018-02-27 16:21:46 +01:00
zmagod 83db7ed01d adds rake task to migrate the samples in custom repositories and tests [fixes SCI-2014] 2018-02-26 17:21:58 +01:00
zmagod 5922aa21a8 adds fetch_all_team_samples method/spec 2018-02-15 17:38:45 +01:00
zmagod c53df21946 adds specs for sample_to_repository migration service 2018-02-15 16:56:38 +01:00
zmagod e0ac8e8f91 extract helper methods in service 2018-02-15 09:36:09 +01:00
zmagod 36595d33f4 fix name scope 2018-02-12 09:09:56 +01:00
zmagod d12f8403e4 add reference to repository column 2018-02-12 09:05:41 +01:00
zmagod ae99c92516 follow @okriuchykhin 's suggestions 2018-02-09 16:28:21 +01:00