scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-24 17:06:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
8653 commits 69 branches 179 tags 165 MiB
Commit graph

8653 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
aignatov-bio 9a8e53c4bc
Fix routes 2020-09-02 12:08:43 +02:00
Mojca Lorber 634dd2ae5e Add css variable 2020-09-02 12:00:52 +02:00
aignatov-bio 4c7312faf9 Add tests for new workflow endpoints 2020-09-02 11:43:00 +02:00
Mojca Lorber d57eb68f93 Fix tables header corners 2020-09-01 16:25:30 +02:00
Urban Rotnik 447ba6aa64
Merge pull request #2812 from urbanrotnik/ur-sci-4969-status-on-task-card 
Show status on task card [SCI-4969]
 2020-09-01 15:28:48 +02:00
aignatov-bio 68f31ce7ec Add api endpoints for workflows 2020-09-01 15:01:38 +02:00
Urban Rotnik ed5869ff8e Show status on task card 2020-09-01 14:56:48 +02:00
Alex Kriuchykhin a37696f1e9
Merge pull request #2811 from urbanrotnik/ur-sci-4967-edit-expriment-error 
Fix edit experiment error [SCI-4967]
 2020-09-01 14:55:25 +02:00
aignatov-bio e1229f5606 Fix test and status validations 2020-09-01 14:49:58 +02:00
Urban Rotnik 5148902d93 Fix error on edit experiment 2020-09-01 13:37:57 +02:00
aignatov-bio ce84c1546b Fix tests 2020-09-01 12:41:00 +02:00
aignatov-bio 9ff5e8bd7d Add task state change error handling and validation 2020-09-01 12:41:00 +02:00
aignatov-bio bd05214514
Merge pull request #2769 from urbanrotnik/ur-sci-4827-update-activities 
Add activities for status change [SCI-4827]
 2020-09-01 12:33:36 +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 d8378f4bc4
Merge pull request #2796 from mlorb/ml-sci-4934 
Add factories for new task flows models [SCI-4934]
 2020-08-31 11:16:39 +02:00
Urban Rotnik 8b0b296b90
Merge pull request #2774 from okriuchykhin/ok_SCI_4829 
Add task status to export all [SCI-4829]
 2020-08-31 11:13:44 +02:00
Urban Rotnik 2cc0422ba8
Merge pull request #2807 from aignatov-bio/ai-sci-status-migration 
Add migration for task states [SCI-4962]
 2020-08-28 13:05:17 +02:00
Urban Rotnik 8adc841f86
Merge pull request #2808 from urbanrotnik/ur-sci-4959 
Iframe controller action [SCI-4959]
 2020-08-28 11:29:23 +02:00
Urban Rotnik 4eebfa5461 Controller action for card inline preview 2020-08-28 11:05:52 +02:00
aignatov-bio 12b903dbe7
Merge pull request #2802 from aignatov-bio/ai-sci-4930-add-office-preview-attachments 
Add WOPI preview for office files [SCI-4930]
 2020-08-27 14:57:13 +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
aignatov-bio 6229ba6041 Add morkflow generator 2020-08-27 12:13:13 +02:00
aignatov-bio c07ebe90fa Add migration for task states 2020-08-27 11:34:59 +02:00