scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-22 07:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
8590 commits 70 branches 179 tags 165 MiB
Commit graph

8590 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aignatov-bio 56322f1247
Merge pull request #2852 from aignatov-bio/develop 
Merge task flows and smart annotation
 2020-09-17 14:55:13 +02:00
aignatov-bio e5d3fac112 Merge branch 'features/smart-annotation-improvements' into develop 2020-09-17 14:52:51 +02:00
aignatov-bio 6ed8757eb1 Merge branch 'features/task-flows' into develop 2020-09-17 14:52:05 +02:00
aignatov-bio d560470df2
Merge pull request #2844 from aignatov-bio/ai-sci-4950-implement-remember-selection-of-smart-annotation 
Add remembered state for smart annotation [SCI-4950]
 2020-09-17 14:49:35 +02:00
aignatov-bio 8dbc69aa31 Remove console.log 2020-09-17 14:48:26 +02:00
aignatov-bio 4adb8fecd3
Merge pull request #2845 from urbanrotnik/ur-sci-4789-improve-search-for-smart-annotations 
Improve search for smart annotations [SCI-4789]
 2020-09-17 14:03:17 +02:00
Urban Rotnik 462fb12a41 Update SQL query 2020-09-17 13:30:27 +02:00
Urban Rotnik 777afd0e9b Add improved search for smart annotations 2020-09-17 13:19:52 +02:00
aignatov-bio f11f54db33 Small fixes 2020-09-17 13:11:54 +02:00
aignatov-bio b4102f3cfd Add try/cath for JSON.parse 2020-09-17 11:43:08 +02:00
aignatov-bio 9cb26a1cb9 Fix markup 2020-09-17 11:43:08 +02:00
aignatov-bio 3691d21215 Fix multiple smart annotation selected 2020-09-17 11:43:08 +02:00
aignatov-bio 86667feb6b Add remembered state for smart annotation 2020-09-17 11:43:07 +02:00
mlorb 4acd0c4cb9
Merge pull request #2841 from mlorb/ml-sci-4984 
Add saving state for filters on dashboard [SCI-4984]
 2020-09-17 09:53:16 +02:00
aignatov-bio 20ecc6dc0b
Merge pull request #2838 from aignatov-bio/ai-sci-4986-refactor-user-smart-annotation 
Update user smart annotation [SCI-4986][SCI-4995]
 2020-09-17 09:36:13 +02:00
aignatov-bio 13b775e495
Merge pull request #2849 from aignatov-bio/ai-sci-5008-add-before-send-condiiton-for-status-change 
Add before send condition for status change [SCI-5008]
 2020-09-17 09:16:14 +02:00
Oleksii Kriuchykhin 0147e1aee1 Add Create and Update endpoints for experiments [SCI-4999] 2020-09-16 23:15:36 +02:00
Oleksii Kriuchykhin dd4a62bb45 Add Create and Update endpoints for projects [SCI-4997] 2020-09-16 17:03:39 +02:00
Alex Kriuchykhin 5b564ed7d4
Merge pull request #2848 from urbanrotnik/ur-sci-4893-fix-hound 
Fix RuboCop at hound supported version [SCI-4893]
 2020-09-16 16:42:58 +02:00
aignatov-bio c26f8e7193 Add before send condition for status change 2020-09-16 15:23:53 +02:00
Alex Kriuchykhin aadc0bebff
Merge pull request #2847 from okriuchykhin/ok_SCI_5004_v2 
Fix status consequences execution order [SCI-5004]
 2020-09-16 15:21:47 +02:00
Urban Rotnik 2de1f901e6 Fix rubocop at hound supported version 2020-09-16 14:14:04 +02:00
Oleksii Kriuchykhin ff1476d46a Fix status consequences execution order [SCI-5004] 2020-09-16 13:45:58 +02:00
Urban Rotnik f2094a77ba
Merge pull request #2846 from urbanrotnik/ur-sci-5010 
Fix JS error, empty task
 2020-09-16 13:42:54 +02:00
Urban Rotnik c9de9e857f Fix constant initialization 2020-09-16 12:15:23 +02:00
Mojca Lorber 9cd8e3b7ac Change default status values, add project and experiment to saved state and fix parsing error handeling 2020-09-16 09:48:06 +02:00
aignatov-bio 14acf2b624 Add i18n 2020-09-15 14:47:57 +02:00
mlorb 818a4dfdb3
Merge pull request #2835 from mlorb/ml-sci-4976 
Disable 'complete step' button on locked task [SCI-4976]
 2020-09-15 13:50:30 +02:00
Mojca Lorber 3c30ee904e Merge branch 'features/task-flows' into ml-sci-4984 2020-09-15 13:27:34 +02:00
mlorb bf707a11a9
Merge branch 'features/task-flows' into ml-sci-4976 2020-09-15 12:59:49 +02:00
Alex Kriuchykhin 04686d4ffc
Merge pull request #2842 from okriuchykhin/ok_SCI_5004 
Add Completion and Uncompletion consequences [SCI-5004]
 2020-09-15 12:56:27 +02:00
Alex Kriuchykhin 6269802be4
Merge pull request #2843 from okriuchykhin/ok_SCI_4881 
Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881]
 2020-09-15 12:53:01 +02:00
aignatov-bio e924dc220f
Merge pull request #2840 from aignatov-bio/ai-sci-5005-update-frontend-permissions-for-status-flow 
Update front-end permission check [SCI-5005]
 2020-09-15 12:45:14 +02:00
aignatov-bio 67d3a1ad12 Fix markup 2020-09-15 12:06:20 +02:00
Oleksii Kriuchykhin db3de835f8 Change subject to task for activities for exporting assigned items (live & snapshots) [SCI-4881] 2020-09-15 11:58:35 +02:00
aignatov-bio 6dc4422d82 Fix markup 2020-09-15 11:56:44 +02:00
Oleksii Kriuchykhin 57716fd89c Fix API and tests for new task completion logic [SCI-5004] 2020-09-15 11:19:25 +02:00
Mojca Lorber fe7d922cc5 Refactor complete step button 2020-09-15 11:18:15 +02:00
Oleksii Kriuchykhin 73cf620960 Add Completion and Uncompletion consequences [SCI-5004] 2020-09-14 20:06:48 +02:00
Mojca Lorber 13f719a9e1 Add saving state for filters on dashboard 2020-09-14 18:15:57 +02:00
aignatov-bio c10e2d231e Update frontend permission check 2020-09-14 15:59:09 +02:00
Alex Kriuchykhin 51d69f9442
Merge pull request #2839 from okriuchykhin/ok_SCI_4978 
Move some consequence executon into background process [SCI-4978]
 2020-09-14 14:39:53 +02:00
Urban Rotnik 5d9523704e Merge branch 'jg_sci_2228' of github.com:jbargu/scinote-web into jg_sci_2228 2020-09-14 11:33:04 +02:00
Oleksii Kriuchykhin a7c6ab9d89 Move some consequence executon into background process [SCI-4978] 2020-09-11 16:18:39 +02:00
aignatov-bio 008563a7f4 Update user smart annotation 2020-09-11 13:00:13 +02:00
aignatov-bio 19079cf977
Merge pull request #2837 from aignatov-bio/ai-sci-4998-fix-status-dropdown-for-disabled-options 
Disable button when condition not fulfilled [SCI-4998]
 2020-09-11 12:29:20 +02:00
aignatov-bio 5a063f070d Clone module before condition validation 2020-09-10 16:53:07 +02:00
aignatov-bio 18426b90be Disable button when condition not fullfield 2020-09-10 13:40:52 +02:00
aignatov-bio 4b8f940c41
Merge pull request #2824 from aignatov-bio/ai-sci-4949-update-css-for-smart-annotation 
Refactor smart annotation front-end [SCI-4949]
 2020-09-10 13:11:43 +02:00
mlorb 3d2aaed791
Merge pull request #2820 from mlorb/ml-sci-4580 
Fix buttons visability on reports page according to new styleguide [SCI-4580]
 2020-09-10 09:32:16 +02:00