Commit graph

10079 commits

Author SHA1 Message Date
mlorb
159cef0494
Merge pull request #2830 from mlorb/ml-sci-4952
Update smart annotation appearance in the text [SCI-4952]
2020-09-09 10:28:37 +02:00
Mojca Lorber
ea1510bcdd Fix quotes 2020-09-09 10:27:32 +02:00
aignatov-bio
84682c6346
Merge pull request #2823 from mlorb/ml-sci-4575
Replace old arrow with new one [SCI-4575]
2020-09-09 09:05:39 +02:00
aignatov-bio
9a771da7f7
Merge pull request #2821 from mlorb/ml-sci-4578
Fix buttons visability on protocols page according to new styleguide [SCI-4578]
2020-09-09 09:05:26 +02:00
aignatov-bio
ae1bec2a95
Merge pull request #2818 from mlorb/ml-sci-4572
Change step checklist and table edit mode [SCI-4572]
2020-09-09 09:02:56 +02:00
aignatov-bio
bdb3caf5cf Add i18n 2020-09-09 08:50:24 +02:00
aignatov-bio
687093e110
Merge pull request #2817 from aignatov-bio/ai-sci-4972-fix-complete-state-for-tasks
Add completed/uncompleted methods to my_module [SCI-4972]
2020-09-09 08:20:36 +02:00
Oleksii Kriuchykhin
99d136918c Merge branch 'develop' into features/pwa 2020-09-08 16:34:28 +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
dependabot[bot]
9a5905baf2
Bump http-proxy from 1.17.0 to 1.18.1
Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-08 14:22:28 +00:00
Alex Kriuchykhin
f9e78a1acc
Merge pull request #2822 from biosistemika/dependabot/npm_and_yarn/node-sass-4.13.1
Bump node-sass from 4.12.0 to 4.13.1
2020-09-08 16:21:41 +02:00
Alex Kriuchykhin
7eb43a16d5
Merge pull request #2806 from okriuchykhin/ok_SCI_4859
Add secondary-navigation-title-name data hook [SCI-4859]
2020-09-08 16:19:42 +02:00
Urban Rotnik
c628fb2598 Remove duplicated notes section in reports 2020-09-08 16:10:24 +02:00
Urban Rotnik
d9b691103c Add permission error message 2020-09-08 15:42:30 +02:00
Oleksii Kriuchykhin
bee550531f Merge branch 'develop' into master 2020-09-08 15:05:56 +02:00
Oleksii Kriuchykhin
f471219499 Bump version to 1.19.7 2020-09-08 15:05:36 +02:00
aignatov-bio
97db1e0e1c Fix tests 2020-09-08 14:57:26 +02:00
aignatov-bio
4083ed1755 Fix tests 2020-09-08 14:52:23 +02:00
Alex Kriuchykhin
a938db8271
Merge pull request #2831 from okriuchykhin/ok_SCI_4880_v2
Improve step reposition after deletion [SCI-4880]
2020-09-08 13:13:27 +02:00
Oleksii Kriuchykhin
dd347aa834 Improve step reposition after deletion [SCI-4880] 2020-09-08 11:48:06 +02:00
aignatov-bio
e1255bf942 Remove duplicate action 2020-09-08 09:50:26 +02:00
aignatov-bio
0be99c12c2 revert changes 2020-09-08 09:45:42 +02:00
aignatov-bio
ee333a982a Revert back state logic 2020-09-08 09:45:42 +02:00
aignatov-bio
bd1d6a772b Add completed/uncompleted methods to my_module 2020-09-08 09:45:09 +02:00
Mojca Lorber
0eb81065b3 Fix tests 2020-09-08 09:39:15 +02:00
aignatov-bio
823ac1e70d
Merge pull request #2826 from aignatov-bio/ai-sci-4985-fix-error-on-canvas-page
Skip implications for my_module canvas position update [SCI-4985]
2020-09-08 09:30:54 +02:00
Mojca Lorber
7e9ef9496f Update smart annotation appearance in the text 2020-09-07 18:30:54 +02:00
aignatov-bio
492d25f9b3 Add description for conditions 2020-09-07 15:12:09 +02:00
Alex Kriuchykhin
e3a90d41ad
Merge pull request #2828 from okriuchykhin/ok_SCI_4880_v2
Fix canvas edit mode [SCI-4880]
2020-09-07 14:58:19 +02:00
Oleksii Kriuchykhin
3150a36a64 Fix canvas edit mode [SCI-4880] 2020-09-07 14:54:49 +02:00
Alex Kriuchykhin
7fe26fb90f
Merge pull request #2827 from okriuchykhin/ok_SCI_4880_v2
Fix missing step edit button [SCI-4880]
2020-09-07 13:52:12 +02:00
Oleksii Kriuchykhin
ea845040aa Fix missing step edit button [SCI-4880] 2020-09-07 13:49:11 +02:00
aignatov-bio
f2ffe17636 Skip implications for my_module canvas position update 2020-09-07 13:05:26 +02:00
Alex Kriuchykhin
5f15d86925
Merge pull request #2825 from okriuchykhin/ok_SCI_4880_v2
Fix handling of duplicated step positions [SCI-4880]
2020-09-07 11:16:07 +02:00
Urban Rotnik
9bddac5191 Check if indexes exists in DB 2020-09-07 10:55:05 +02:00
Oleksii Kriuchykhin
dea75553a3 Fix handling of duplicated step positions [SCI-4880] 2020-09-07 10:44:00 +02:00
Mojca Lorber
9dac4079f8 Replace old arrow with new one and remove redundant javascript for arrow collapsing 2020-09-04 14:43:30 +02:00
dependabot[bot]
57e92c2135
Bump node-sass from 4.12.0 to 4.13.1
Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.1.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/compare/v4.12.0...v4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-04 11:33:56 +00:00
Oleksii Kriuchykhin
7668e16419 Enable CORS for PWA [SCI-4979] 2020-09-04 11:47:45 +02:00
Mojca Lorber
24745203e1 Fix buttons visability on protocols page according to new styleguide 2020-09-03 17:05:25 +02:00
Mojca Lorber
1f0d9f3ad7 Fix buttons visability on reports page according to new styleguide 2020-09-03 16:19:02 +02:00
aignatov-bio
d85703113a Add front-end checks 2020-09-03 14:34:34 +02:00
aignatov-bio
8b1e11a314 Add conditions_fulfilled? method 2020-09-03 14:20:38 +02:00
aignatov-bio
4c1e120f23
Merge pull request #2810 from aignatov-bio/ai-sci-4968-add-error-handling-for-state-change
Add error handling for state change [SCI-4968]
2020-09-03 11:47:48 +02:00
aignatov-bio
5cb497b61d Split params validation to create and update 2020-09-03 09:49:00 +02:00
aignatov-bio
39105a807a
Merge pull request #2816 from aignatov-bio/ai-sci-4960-fix-css-issue-for-status-flow
Fix css for status flows [SCI-4970]
2020-09-03 09:46:19 +02:00
Mojca Lorber
06d75fb07e Change step checklist and table edit mode 2020-09-02 18:04:37 +02:00
mlorb
54393d4641
Merge pull request #2813 from mlorb/ml-sci-4583
Fix tables header corners [SCI-4583]
2020-09-02 17:55:59 +02:00
aignatov-bio
257329ce80 Fix css for status flows 2020-09-02 15:41:07 +02:00
Oleksii Kriuchykhin
a508b07275 Add view mode field to the Asset model [SCI-4958] 2020-09-02 15:02:56 +02:00