Commit graph

7792 commits

Author SHA1 Message Date
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
aignatov-bio
443c301ca1 Fix align for step content 2020-05-14 21:53:00 +02:00
aignatov-bio
c9a9cd2e75 Remove search from state load in task repository 2020-05-14 21:49:01 +02:00
Urban Rotnik
ba68eef044 Fix for empty status cell 2020-05-14 17:59:25 +02:00
mlorb
1e0fed75d1
Merge pull request #2551 from mlorb/ml-sci-4620
Fix missing corner on opened task inventory [SCI-4620]
2020-05-14 17:25:39 +02:00
aignatov-bio
e49d2dfbae
Merge pull request #2546 from aignatov-bio/ai-sci-4605-some-inventories-task-corrections
Small task inventories corrections [SCI-4605]
2020-05-14 16:45:45 +02:00
aignatov-bio
ce1540aaa9 Small task inventories corrections 2020-05-14 16:41:02 +02:00
aignatov-bio
5ef31091b8
Merge pull request #2552 from aignatov-bio/ai-sci-4600-small-snapshots-corrections
Small snapshots CSS corrections [SCI-4600]
2020-05-14 16:31:06 +02:00
aignatov-bio
af4ac7c53b Add const to dropdown library 2020-05-14 16:29:50 +02:00
aignatov-bio
309f8c1a3d Small snapshots CSS corrections 2020-05-14 16:29:50 +02:00
aignatov-bio
78b4067c50
Merge pull request #2549 from aignatov-bio/ai-sci-4604-small-snapshot-corrections
Small snapshot css corrections [SCI-4604]
2020-05-14 15:18:13 +02:00
aignatov-bio
8f946c45c3
Merge pull request #2553 from aignatov-bio/ai-sci-4518-optimize-task-mobile-view
Small CSS improvments for mobile [SCI-4518]
2020-05-14 14:20:40 +02:00
aignatov-bio
9b685fdaa6
Merge pull request #2554 from aignatov-bio/ai-sci-4613-add-icon-to-cancel-button
Add icon to cancel button [SCI-4613]
2020-05-14 13:19:20 +02:00
aignatov-bio
445f55acc7
Merge pull request #2555 from aignatov-bio/ai-sci-4598-change-task-details-to-onclick
Replace bootstrap popover with bootstrap dropdown [SCI-4598]
2020-05-14 13:19:08 +02:00
aignatov-bio
99e1affa73
Merge pull request #2556 from aignatov-bio/ai-sci-4515-fix-smart-annotation-position
Fix smart annotation position for horizontal scroll [SCI-4515]
2020-05-14 13:18:57 +02:00
aignatov-bio
5bdf1ff586
Merge pull request #2558 from aignatov-bio/ai-sci-4608-fix-pdf-report-time-position
Prevent time to go newline in reports [SCI-4608]
2020-05-14 13:18:31 +02:00
Alex Kriuchykhin
384b107c6c
Merge pull request #2560 from biosistemika/SCI-4601-fix-snapshot-bugs
SCI-4601 fix the associations, renaming variable
2020-05-14 13:09:10 +02:00
Miha Mencin
15508a5065 codestyle fix 2020-05-14 12:57:16 +02:00
Miha Mencin
26caeed04f
increase pooling interval to 10s 2020-05-14 12:39:13 +02:00
Mojca Lorber
009dce110b Css fix 2020-05-14 12:18:45 +02:00
Miha Mencin
0e5ce1054e decrease pooling time for snapshots 2020-05-14 12:03:07 +02:00
Miha Mencin
2e4655f9ee
Merge pull request #2548 from urbanrotnik/ur-sci-4609-task-card-due-date
Task card due date fix [SCI-4609]
2020-05-14 11:52:44 +02:00
Miha Mencin
522171bb78
Merge pull request #2550 from urbanrotnik/ur-sci-4546-table-name-missing
Add table name property to export schema [SCI-4546]
2020-05-14 11:52:04 +02:00
Miha Mencin
76232f0298 SCI-4601 fix the associations, minor styling changes 2020-05-14 11:47:19 +02:00
Alex Kriuchykhin
f089e4abc8
Merge pull request #2559 from okriuchykhin/ok_SCI_4596
Restore deleted method after rebase [SCI-4596]
2020-05-14 11:20:08 +02:00
Oleksii Kriuchykhin
ea740eb2a4 Restore deleted method after rebase [SCI-4596] 2020-05-14 10:57:43 +02:00
Alex Kriuchykhin
a341bd533b
Merge pull request #2557 from okriuchykhin/ok_SCI_4596
Make snapshots selectable [SCI-4596]
2020-05-14 10:15:44 +02:00
Urban Rotnik
fbd44a4e23
Merge pull request #2547 from urbanrotnik/ur-sci-4557-update-permissions
Update permissions and automatic snapshots [SCI-4557] [SCI-4624]
2020-05-14 10:04:56 +02:00
aignatov-bio
9076fab12f Prevent time to go newline in reports 2020-05-13 18:46:58 +02:00
Oleksii Kriuchykhin
9c70fa1990 Fix code style [SCI-4596] 2020-05-13 18:00:58 +02:00
Oleksii Kriuchykhin
ba1661b40f Fix handling of deleted repositories for snapshots [SCI-4596] 2020-05-13 18:00:56 +02:00
Oleksii Kriuchykhin
c74fa3c244 Make snapshots selectable [SCI-4596] 2020-05-13 17:58:05 +02:00