Commit graph

675 commits

Author SHA1 Message Date
Urban Rotnik
45a09e5a3c Fix tests 2020-09-09 13:17:07 +02:00
Alex Kriuchykhin
c413ac21a1
Merge pull request #2798 from aignatov-bio/ai-sci-4831-update-api-for-new-statuses
Add API endpoints for workflows [SCI-4831]
2020-09-08 16:23:05 +02:00
aignatov-bio
97db1e0e1c Fix tests 2020-09-08 14:57:26 +02:00
Mojca Lorber
0eb81065b3 Fix tests 2020-09-08 09:39:15 +02:00
aignatov-bio
4c7312faf9 Add tests for new workflow endpoints 2020-09-02 11:43:00 +02:00
aignatov-bio
e1229f5606 Fix test and status validations 2020-09-01 14:49:58 +02:00
Urban Rotnik
581cd69963 Add activities for status change 2020-09-01 11:48:04 +02:00
Urban Rotnik
b6e68ec1e2 Remove tests 2020-08-31 16:56:40 +02:00
Urban Rotnik
a259800590 Merge branch 'develop' into jg_sci_2228 2020-08-31 16:29:23 +02:00
Urban Rotnik
fb8f69c3e4 Revert controllers spec 2020-08-27 13:49:32 +02:00
Mojca Lorber
6fefd4d945 Add factories for new task flows models 2020-08-27 13:38:32 +02:00
Urban Rotnik
a5fb873d19 Add default workflow 2020-08-27 10:54:39 +02:00
Oleksii Kriuchykhin
ed2eb81c68 Switch to position swapping when updating step position [SCI-4880] 2020-08-25 15:46:23 +02:00
Urban Rotnik
7c14da70d9
Merge branch 'features/task-flows' into develop_to_task_flows 2020-08-04 14:50:46 +02:00
Alex Kriuchykhin
22015beeb5
Merge pull request #2757 from urbanrotnik/ur-sci-4813-base64-multipart-upload
Extend asset API upload to support base64 [SCI-4813]
2020-08-04 09:43:01 +02:00
Urban Rotnik
9b06510dcc Update PUT result file endpoint, refactor 2020-08-03 15:14:58 +02:00
Oleksii Kriuchykhin
1a8333612a Merge branch 'features/pwa' into develop 2020-07-27 09:47:41 +02:00
Urban Rotnik
4958139699 Extend asset API upload to support base64 2020-07-24 14:57:03 +02:00
Urban Rotnik
025378cd0e Fix translations and JS 2020-07-23 15:53:46 +02:00
Alex Kriuchykhin
26cfa001c8
Merge pull request #2747 from urbanrotnik/ur-sci-4769-canvas-test
Add test for canvas_controller [SCI-4769]
2020-07-23 15:18:01 +02:00
Urban Rotnik
aecd6b228b
Merge pull request #2744 from urbanrotnik/ur-sci-4764-increase-characters-limit-for-rte
Increase chars limit for RTE [SCI-4764]
2020-07-23 12:58:36 +02:00
Urban Rotnik
512d6f3229 Add actions for update status, clean old complete actions 2020-07-22 16:12:34 +02:00
aignatov-bio
ddfe8231d8 Merge branch 'features/2fa' into develop 2020-07-22 11:56:36 +02:00
Oleksii Kriuchykhin
809e0c7d77 Fix tests for MyModule [SCI_4825] 2020-07-21 16:20:19 +02:00
Urban Rotnik
3232b4d6bf Add test for canvas_controller 2020-07-21 13:49:59 +02:00
Urban Rotnik
9dffc27428 Increase chars limit for RTE 2020-07-20 13:33:38 +02:00
Oleksii Kriuchykhin
7fd004baa8 Prepare database structure and relations for statuses phase one [SCI-4825] 2020-07-17 18:04:09 +02:00
aignatov-bio
cadbc3e47b Fix tests 2020-07-14 11:20:06 +02:00
Oleksii Kriuchykhin
b4fab62d38 Merge branch 'develop' into ok_SCI_4776 2020-07-10 13:40:46 +02:00
Urban Rotnik
b11f166c38 Fix cucumber tests 2020-07-09 13:14:07 +02:00
aignatov-bio
6245e19069
Merge pull request #2718 from biosistemika/master
Merge master to develop
2020-07-09 12:56:31 +02:00
mlorb
73e2654d78
Merge pull request #2701 from mlorb/ml-sci-4793
Add empty states to inventories datatable and fix filtering bug [SCI-4793]
2020-07-09 11:49:16 +02:00
aignatov-bio
13f7653667 Merge branch 'develop' into features/2fa 2020-07-07 13:05:45 +02:00
Oleksii Kriuchykhin
3af20c96c7 Fix tests and checklist item validation [SCI-4776] 2020-07-03 16:48:32 +02:00
Oleksii Kriuchykhin
dc481cf236 Add API endpoints for checklists, checklist items, tables, API code improvements [SCI-4776] 2020-07-03 16:48:29 +02:00
Mojca Lorber
a6b73a20fc Fix tests again 2020-07-03 13:18:30 +02:00
Mojca Lorber
47198c442d Fix tests 2020-07-02 17:32:26 +02:00
aignatov-bio
9b33cbc104 Rename ensure 2fa method 2020-07-02 11:24:33 +02:00
aignatov-bio
46256c89c9 Fix tests 2020-07-01 15:44:52 +02:00
aignatov-bio
4b9881e31e Add 2fa to user settings page 2020-07-01 13:25:06 +02:00
Urban Rotnik
62a4a5f203 Add 2fa login 2020-07-01 12:46:26 +02:00
Mojca Lorber
22b71bc9cb Merge branch 'develop' into ml-sci-4261 2020-06-30 13:47:32 +02:00
Urban Rotnik
de8aca9dbd Rename column 2020-06-29 10:42:19 +02:00
Urban Rotnik
88f54b16d7 Add 2fa fields to user 2020-06-24 17:58:58 +02:00
Oleksii Kriuchykhin
7ea577d8d4 Merge branch 'features/inventory-archiving' into develop 2020-06-24 14:04:54 +02:00
Alex Kriuchykhin
e1b862a332
Merge pull request #2679 from urbanrotnik/ur-sci-4741-api-endopints-update
Filter out non active repositories and rows [SCI-4741]
2020-06-24 12:51:13 +02:00
Urban Rotnik
2f4bf95373 Revert scrope 2020-06-24 11:42:59 +02:00
Urban Rotnik
8dc48e9f95 Remove archiving rows from RepositoryArchiveService 2020-06-24 10:35:24 +02:00
Urban Rotnik
91af7135c1 Update scopes for repository items 2020-06-23 18:24:46 +02:00
Urban Rotnik
6de322498b Delegate archived methods to parent repository 2020-06-23 17:16:02 +02:00
Urban Rotnik
c565cbe579 Filter out non active repositories and rows 2020-06-23 10:23:22 +02:00
Urban Rotnik
e89bf58e1c Refactory restore inventory service 2020-06-23 08:24:52 +02:00
Urban Rotnik
d874b6f732 Refactory archive inventory service 2020-06-22 22:45:34 +02:00
Urban Rotnik
30de400cf9
Merge pull request #2676 from mlorb/ml-sci-4786
Revert default_scope for active repositories [SCI-4786]
2020-06-22 16:17:39 +02:00
Mojca Lorber
be19190ff1 Revert default_scope for active repositories 2020-06-22 14:57:35 +02:00
aignatov-bio
593455537d Fix tests 2020-06-22 09:48:37 +02:00
Urban Rotnik
b498aa54d3
Merge pull request #2661 from urbanrotnik/ur-sci-4740-default-scope
Update default scope [SCI-4740] [SCI-4687][SCI-4746]
2020-06-18 14:07:10 +02:00
Urban Rotnik
83bd8c3ad4 Add default scope for non archived repositories 2020-06-16 09:18:22 +02:00
aignatov-bio
a6ff5b1ed8
Merge pull request #2653 from aignatov-bio/ai-sci-4692-add-archiving-columns-to-datable-helper
Add archiving column to datatable helper [SCI-4692]
2020-06-15 15:35:19 +02:00
Urban Rotnik
15342cd8f2 Fix update_canvas 2020-06-15 10:52:35 +02:00
aignatov-bio
fe37afcc41 Update tests 2020-06-15 09:54:01 +02:00
mlorb
0a7c9aeb1a
Merge pull request #2651 from urbanrotnik/ur-sci-4706-archiving-restoring-rows
Archiving & restoring rows [SCI-4706]
2020-06-11 16:41:53 +02:00
Urban Rotnik
fabfd7ddaf Add controller action for Archive&Restore 2020-06-09 19:18:30 +02:00
Urban Rotnik
26db4f3515 Add Archive and Restore service 2020-06-09 18:50:36 +02:00
aignatov-bio
37baa13f47 Fi tests 2020-06-09 14:37:45 +02:00
aignatov-bio
c0e984b316 Fix tests 2020-06-04 18:41:45 +02:00
Urban Rotnik
446a2db186 Export and import checklist items with delimiter 2020-06-01 17:19:33 +02:00
aignatov-bio
f963608996 Add I18n and tests 2020-06-01 14:34:04 +02:00
Mojca Lorber
285280827a Refactor repository column base controller 2020-05-28 12:18:46 +02:00
Mojca Lorber
c673e27109 Merge branch 'develop' into ml-sci-4261 2020-05-28 08:18:24 +02:00
Oleksii Kriuchykhin
d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Oleksii Kriuchykhin
c0521c3ca7 Prevent the inventory items editing while snapshot is being created [SCI-4629] 2020-05-15 17:46:59 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
8ec7a4b7b4 Merge branch 'features/new-task-layout' into ai-sci-4559-add-assigned-tasks-dropdown-to-inventory 2020-05-07 13:03:00 +02:00
aignatov-bio
ff2a7aa9b6 Fix spec markup 2020-05-05 09:47:55 +02:00
aignatov-bio
b01ff206e8 Fix tests 2020-04-28 13:18:57 +02:00
Urban Rotnik
9c3fb063c0 Fix counter and error showing for CheckList column type 2020-04-24 16:09:54 +02:00
aignatov-bio
c2e456aa27 Fix activities and specs 2020-04-23 15:25:28 +02:00
aignatov-bio
10fdd0c1c7 Merge branch 'develop' into features/new-task-layout 2020-04-23 14:07:40 +02:00
Oleksii Kriuchykhin
837437309e Fix failing tests [SCI-4516] 2020-04-09 17:11:58 +02:00
Oleksii Kriuchykhin
3c53be1f9a Add start date to the task [SCI-4504] 2020-03-31 14:17:14 +02:00
aignatov-bio
6d41d4d112 Fix tests 2020-03-31 14:16:31 +02:00
Miha Mencin
ecd49cb1e7 fix format and export_format mess 2020-03-18 09:57:57 +01:00
Miha Mencin
24b979aa6f fix CR comments 2020-03-18 09:53:47 +01:00
Miha Mencin
c89503f691 SCI-4464 fix the import of the dates, some tests 2020-03-17 21:20:50 +01:00
Oleksii Kriuchykhin
675b578272 Add used space calculation method to the team model [SCI-4459] 2020-03-17 16:56:55 +01:00
Alex Kriuchykhin
2a2e479cd3
Merge pull request #2470 from okriuchykhin/ok_SCI_4408
Enable time fraction for task due date [SCI-4408]
2020-03-16 18:55:10 +01:00
Oleksii Kriuchykhin
bece39fbfb Fix failing tests [SCI-4408] 2020-03-16 18:30:17 +01:00
Mojca Lorber
8dac5effbe Another fix 2020-03-13 14:57:26 +01:00
Mojca Lorber
c716a52aae Fix bug with date format when importing to inventory 2020-03-12 12:19:25 +01:00
Oleksii Kriuchykhin
9d0d75acc5 Add API endpoints for new column types [SCI-4276] 2020-02-18 15:13:46 +01:00
Alex Kriuchykhin
9c763f2111 Merge pull request #2383 from okriuchykhin/ok_SCI_4220
Extend inventory import to support new data types [SCI-4220]
2020-02-10 11:04:34 +01:00
Oleksii Kriuchykhin
7d107bf45b Fix tests [SCI-4317] 2020-02-05 11:58:27 +01:00
Mojca Lorber
f0dcf60421 Fix tests 2020-02-04 16:23:06 +01:00
Mojca Lorber
2727614603 Clean up controllers for manage repository columns 2020-02-04 16:05:16 +01:00
Oleksii Kriuchykhin
632b54cb98 Merge branch 'develop' into ok_SCI_4220 2020-02-03 15:50:06 +01:00
Oleksii Kriuchykhin
b0c785f4fb Extend inventory import to support new data types [SCI-4220] 2020-02-03 15:20:01 +01:00
Miha Mencin
0d3e8ac3e1 remove silly test 2020-01-27 15:04:53 +01:00
Alex Kriuchykhin
da26d8a018
Merge pull request #2304 from okriuchykhin/ok_SCI_4204
Refactor repository cell cloning to support all data types [SCI-4204]
2020-01-15 13:04:50 +01:00
Alex Kriuchykhin
9412cccc9c
Merge pull request #2306 from urbanrotnik/ur-sci-fix-for-list-items-update
Fix for list items update
2020-01-15 12:34:33 +01:00