Commit graph

7824 commits

Author SHA1 Message Date
Urban Rotnik
32df6f2568 Skip cell import if value is nil 2020-05-20 09:56:08 +02:00
mlorb
29370cf82e
Merge pull request #2586 from mlorb/ml-sci-4615
Fix missing creator in task details [SCI-4615]
2020-05-20 09:47:08 +02:00
aignatov-bio
51d9f054ee
Merge pull request #2584 from aignatov-bio/ai-sci-4654-clear-fullview-modal-before-open
Clear full view repository modal before open [SCI-4654]
2020-05-20 09:45:26 +02:00
aignatov-bio
4e7a26bdd0
Merge pull request #2583 from aignatov-bio/ai-sci-4651-fix-repository-ordering
Fix repositories order in dropdown [SCI-4651]
2020-05-20 09:45:13 +02:00
Urban Rotnik
2283491629 Conver to string if not importing into Number column 2020-05-20 09:09:14 +02:00
Mojca Lorber
40a3ee82d5 Add creator to task 2020-05-20 08:59:07 +02:00
aignatov-bio
40b266ee0d Clear full view repository modal before open 2020-05-19 16:44:47 +02:00
aignatov-bio
d714b4b7bf
Merge pull request #2579 from aignatov-bio/ai-sci-4635-fix-checklist-appearance-in-fullview
Fix checklist render in full view [SCI-4635]
2020-05-19 16:18:45 +02:00
aignatov-bio
f8b246eb2a Fix repositories order in dropdown 2020-05-19 16:18:01 +02:00
Urban Rotnik
431bd0c53b
Merge pull request #2582 from urbanrotnik/ur-sci-4650-font-size-fix
Fonts size update [SCI-4650]
2020-05-19 14:55:22 +02:00
mlorb
7cbbcff86a
Merge pull request #2576 from mlorb/ml-sci-4619
Fix manage permissions on views [SCI-4619]
2020-05-19 14:29:11 +02:00
Urban Rotnik
ac4532eea3 Update fonts 2020-05-19 14:14:58 +02:00
aignatov-bio
2dcada4bc5
Merge pull request #2580 from aignatov-bio/ai-sci-4647-add-custom-tinymce-plugins-to-asset-pipeline
Add custom tinymce plugins to assets pipeline [SCI-4647]
2020-05-19 10:31:51 +02:00
aignatov-bio
c00b96ff7e
Merge pull request #2577 from aignatov-bio/ai-sci-4646-fix-task-sections-collapse-animation
Fix collapse animation for task sections [SCI-4646]
2020-05-19 10:31:36 +02:00
Urban Rotnik
1dc0e2b40b
Merge pull request #2581 from urbanrotnik/ur-sci-4640-wrong-snapshot-displayed
Hide sidebar Versions by default [SCI-4640]
2020-05-19 10:27:57 +02:00
Alex Kriuchykhin
49a35f43c5
Merge pull request #2578 from okriuchykhin/ok_SCI_4645
Fix error message for file upload limit on steps [SCI-4645]
2020-05-19 10:27:12 +02:00
Alex Kriuchykhin
afdd6fd149
Merge pull request #2572 from okriuchykhin/ok_SCI_4629
Prevent the inventory items editing while snapshot is being created [SCI-4629]
2020-05-19 10:10:34 +02:00
Urban Rotnik
ea0e97d046 Hide sidebar on modal close 2020-05-19 09:46:38 +02:00
aignatov-bio
3047af759f Add custom tinymce plugins to assets pipeline 2020-05-18 18:06:52 +02:00
aignatov-bio
9db19603dc Fix checklist render in fullview 2020-05-18 16:32:27 +02:00
Oleksii Kriuchykhin
bc1ee1bd8d Fix error message for file upload limit on steps [SCI-4645] 2020-05-18 16:16:39 +02:00
aignatov-bio
9f4457642d Fix collapse animation for task sections 2020-05-18 16:01:26 +02:00
Mojca Lorber
6b6fba591e Fix manage permissions on views 2020-05-18 15:54:32 +02:00
Urban Rotnik
7e009ab8ee
Merge pull request #2574 from urbanrotnik/ur-sci-4634
Fix excel header parsing [SCI-4634]
2020-05-18 14:56:22 +02:00
Alex Kriuchykhin
e9a05d2e3d
Merge pull request #2575 from okriuchykhin/ok_SCI_4637
Fix selection of the default snapshot on tasks [SCI-4637]
2020-05-18 14:25:26 +02:00
Oleksii Kriuchykhin
d77930af61 Fix failing tests for repository rows controller [SCI-4629] 2020-05-18 14:12:06 +02:00
Urban Rotnik
3b08241b0b Fix excel header parsing 2020-05-18 11:39:19 +02:00
aignatov-bio
1f24adddf9
Merge pull request #2562 from aignatov-bio/ai-sci-4627-remove-search-word-from-task-table-state
Remove search from state load in task repository [SCI-4627]
2020-05-18 11:16:27 +02:00
aignatov-bio
acb1b392fc
Merge pull request #2564 from aignatov-bio/ai-sci-4632-remove-task-inventory-tab
Remove inventory tab from task and routes to inventory page [SCI-4632]
2020-05-18 11:16:17 +02:00
aignatov-bio
343356cab7
Merge pull request #2571 from aignatov-bio/ai-sci-4639-select-correct-button-for-assign-modal
Select correct button name for assign modal [SCI-4639]
2020-05-18 11:16:07 +02:00
aignatov-bio
f2d81cb199
Merge pull request #2570 from aignatov-bio/ai-sci-4617-make-snapshot-creation-text-switchable
Make snapshot creation info text switchable [SCI-4617]
2020-05-18 11:15:46 +02:00
aignatov-bio
2b3dda8ce0
Merge pull request #2569 from aignatov-bio/ai-sci-4613-add-title-for-assign-modal
Add a title for full view assign modal [SCI-4613]
2020-05-18 11:15:36 +02:00
Oleksii Kriuchykhin
8b968f6f67 Fix selection of the default snapshot on tasks [SCI-4637] 2020-05-18 11:06:42 +02:00
aignatov-bio
a4f10fb4f4
Merge pull request #2573 from aignatov-bio/ai-sci-4644-upgrade-tinymce-rails-gem
Update tinymce gem version [SCI-4644]
2020-05-18 10:33:36 +02:00
aignatov-bio
820514789d Update tinymce gem version 2020-05-17 17:36:26 +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
313897c1f7
Merge pull request #2568 from biosistemika/features/new-task-layout
Features/new task layout to Develop
2020-05-15 16:14:51 +02:00
Urban Rotnik
a2a4a8bb97 Commentout problematic tests 2020-05-15 15:52:59 +02:00
aignatov-bio
f921ac75d8 Select correct button name for assign modal 2020-05-15 15:37:48 +02:00
aignatov-bio
bc81a48b00 Make snapshot creation info text switchable 2020-05-15 14:44:26 +02:00
Urban Rotnik
a2ade6e0ec Merge branch 'develop' into features/new-task-layout 2020-05-15 14:27:56 +02:00
aignatov-bio
69abccbbd6 Add title for full view assign modal 2020-05-15 14:22:20 +02:00
mlorb
c00eec24bf
Merge pull request #2566 from aignatov-bio/ai-sci-fix-cucumber-test
Small css fixes and test fix
2020-05-15 12:24:18 +02:00
aignatov-bio
dc2caca4f3 Small css fixes and test fix 2020-05-15 11:04:17 +02:00
mlorb
dbd03a09ef
Merge pull request #2565 from mlorb/ml-sci-4511
Add New Task layout Collapsed/Expanded States saving [SCI-4511]
2020-05-15 09:23:05 +02:00
Urban Rotnik
e290f555f4
Merge pull request #2561 from urbanrotnik/ur-sci-4625-import-fix
Fix for empty status cell [SCI-4625]
2020-05-15 08:44:30 +02:00
Mojca Lorber
515d90a530 Fix tests 2020-05-15 07:37:53 +02:00
Mojca Lorber
4c15c89cf5 Add New Task layout Collapsed/Expanded States saving 2020-05-15 00:49:23 +02:00
aignatov-bio
51e3c70a4d
Merge pull request #2563 from aignatov-bio/ai-sci-4638-fix-step-content-aligment
Fix align for step content [SCI-4638]
2020-05-14 22:10:50 +02:00
aignatov-bio
bac98bdbdc Remove inventory tab from task and routes to inventory page 2020-05-14 22:10:13 +02:00