Mojca Lorber
|
8b3fce9656
|
Move it again
|
2020-09-22 11:38:32 +02:00 |
|
Mojca Lorber
|
0ad93d1288
|
Move close modal function to global event
|
2020-09-22 11:30:05 +02:00 |
|
aignatov-bio
|
2d667acdd1
|
Prevent tinymce edit mode when link click
|
2020-09-22 10:56:40 +02:00 |
|
Mojca Lorber
|
fe779f9146
|
Add info of the locked task to the View status flow modal
|
2020-09-22 10:21:55 +02:00 |
|
aignatov-bio
|
b540f90514
|
Merge pull request #2858 from aignatov-bio/ai-sci-5035-fix-smart-annotation-for-shared-inventories
Add shared inventories to smart annotation [SCI-5035]
|
2020-09-22 10:20:20 +02:00 |
|
Alex Kriuchykhin
|
136ce06022
|
Merge pull request #2851 from okriuchykhin/ok_SCI_4999
Add Create and Update endpoints for experiments [SCI-4999]
|
2020-09-22 10:20:00 +02:00 |
|
aignatov-bio
|
fd7773a3dc
|
Fix smart annotation cursor position
|
2020-09-22 10:15:01 +02:00 |
|
Mojca Lorber
|
23d6d93074
|
Fix css
|
2020-09-21 17:13:42 +02:00 |
|
aignatov-bio
|
fde33e6e63
|
Fix tests
|
2020-09-21 14:41:51 +02:00 |
|
aignatov-bio
|
f8a28f378e
|
Add shared inventories to smart annotation
|
2020-09-21 14:36:34 +02:00 |
|
aignatov-bio
|
545e13304a
|
Show smart annotation for archived projects/experiments
|
2020-09-21 14:09:11 +02:00 |
|
Alex Kriuchykhin
|
e19efe3975
|
Merge pull request #2850 from okriuchykhin/ok_SCI_4997
Add Create and Update endpoints for projects [SCI-4997]
|
2020-09-21 13:22:12 +02:00 |
|
Alex Kriuchykhin
|
9fda2dd97e
|
Merge pull request #2855 from okriuchykhin/ok_SCI_5030
Fix task archiving and moving [SCI-5030]
|
2020-09-21 10:49:37 +02:00 |
|
aignatov-bio
|
207287c263
|
Merge pull request #2854 from aignatov-bio/ai-sci-fix-syntax-for-uglifier
Fix syntax for uglifier
|
2020-09-21 09:41:58 +02:00 |
|
Mojca Lorber
|
d9a78d20d7
|
Update empty states for smart annotation results and dismiss button
|
2020-09-18 08:50:01 +02:00 |
|
Oleksii Kriuchykhin
|
e456661a98
|
Fix task archiving and moving [SCI-5030]
|
2020-09-17 17:15:41 +02:00 |
|
aignatov-bio
|
644f30fb10
|
Fix syntax for uglifier
|
2020-09-17 15:35:12 +02:00 |
|
aignatov-bio
|
ec9446d0cb
|
Disable autostrip attrbiutes on status change
|
2020-09-17 15:26:48 +02:00 |
|
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 |
|