Commit graph

5688 commits

Author SHA1 Message Date
aignatov-bio
59e824ef9e
Fix nil handling in different places [SCI-2840] (#1777)
* Fix nil handling in different places
2019-05-21 15:53:34 +02:00
mlorb
be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
Update protocol status bar upon protocol changing [SCI-3193]
2019-05-21 15:28:58 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
Alex Kriuchykhin
64c31a6418
Merge pull request #1786 from okriuchykhin/ok_SCI_3368_v2
Add type column to zip_exports for STI [SCI-3368]
2019-05-21 11:04:51 +02:00
Oleksii Kriuchykhin
d46d82d0f0 Fix Hound warning [SCI-3368] 2019-05-21 10:56:55 +02:00
aignatov-bio
5081546c78
Fix padding for protocol description (#1782) 2019-05-21 10:21:30 +02:00
Alex Kriuchykhin
952f716d9a
Merge pull request #1784 from okriuchykhin/ok_SCI_3485
Remove protocol description from preview popup [SCI-3485]
2019-05-21 10:07:21 +02:00
Oleksii Kriuchykhin
d3f29d5d72 Add type column to zip_exports for STI [SCI-3368] 2019-05-20 16:35:24 +02:00
Mojca Lorber
b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +02:00
Oleksii Kriuchykhin
882c12cd31 Remove protocol description from preview popup [SCI-3485] 2019-05-20 15:04:54 +02:00
Alex Kriuchykhin
36243ff04c
Merge pull request #1783 from okriuchykhin/ok_SCI_3471
Refactor title inline editing permission checking [SCI-3471]
2019-05-20 13:34:23 +02:00
Oleksii Kriuchykhin
1128fedc51 Refactor title inline editing permission checking [SCI-3471] 2019-05-20 13:13:31 +02:00
aignatov-bio
b22dba7f05
Add delay job for handling unknown tinyMCE images (#1781)
* Add delay job for handling unknown tinyMCE images
2019-05-20 12:44:16 +02:00
aignatov-bio
d959769b65
Fix experiment and step title (#1779) 2019-05-20 11:20:08 +02:00
aignatov-bio
20b626d791
Fix warning message issue in step description [SCI-3479] (#1778)
* Fix warning message issue
2019-05-20 11:19:53 +02:00
Luka Murn
4136aa0575 Add a startup check for WOPI_ENABLED == true variables 2019-05-18 10:22:53 +02:00
Luka Murn
c26489acdc Update protocol status bar upon changing of protocol description 2019-05-17 10:22:16 +02:00
Alex Kriuchykhin
df59c54bd4
Merge pull request #1776 from okriuchykhin/ok_SCI_3477
Fix protocol metadata editing in repository [SCI-3477]
2019-05-17 09:42:13 +02:00
Oleksii Kriuchykhin
488fc99dae Fix protocol metadata editing in repository [SCI-3477] 2019-05-16 17:11:17 +02:00
Luka Murn
c844158f6e
Merge pull request #1774 from Ducz0r/lm-hotfix-tinymce-images
Fix bug with external TinyMCE assets
2019-05-16 13:34:46 +02:00
Luka Murn
8aa702a4bf Fix bug with external TinyMCE assets 2019-05-16 13:33:04 +02:00
Miha Mencin
ff84a0f694
Update Version 2019-05-16 10:55:16 +02:00
Alex Kriuchykhin
bcbaf73669
Merge pull request #1773 from okriuchykhin/ok_SCI_3468
Add permission checking to inline editor fields [SCI-3468]
2019-05-15 17:49:15 +02:00
Oleksii Kriuchykhin
2ef926e795 Add permission checking to inline editor fields [SCI-3468] 2019-05-15 17:47:09 +02:00
aignatov-bio
980d86824f
Fix updating process for old tinyMCE tags (#1772)
* Fix update old tinyMCE for deleted objects

* Add error handling
2019-05-15 16:11:48 +02:00
Alex Kriuchykhin
607356ce1b
Merge pull request #1771 from okriuchykhin/ok_SCI_3466
Show task due date in UTC [SCI-3466]
2019-05-15 15:30:17 +02:00
Oleksii Kriuchykhin
71a4a1348a Show task due date in UTC [SCI-3466] 2019-05-15 15:17:44 +02:00
aignatov-bio
24e30867da
Add smart annotation to comments [SCI-3458] (#1768)
* Add smart annotation to comments
2019-05-15 14:59:15 +02:00
aignatov-bio
f1f04adeb2
Fix placeholder in protocol description [SCI-3454] (#1769)
* Fix placeholder in protocol description

* Change task tags text
2019-05-15 14:13:13 +02:00
Alex Kriuchykhin
ae456a6408
Merge pull request #1770 from okriuchykhin/ok_SCI_3376
Force UTF-8 encoding for Table contents in API [SCI-3376]
2019-05-15 13:56:01 +02:00
Alex Kriuchykhin
d12723f7c2
Merge pull request #1767 from okriuchykhin/ok_SCI_2841
Improve handling of CSRF token errors [SCI-2841]
2019-05-15 13:48:19 +02:00
Oleksii Kriuchykhin
94953b03c8 Force UTF-8 encoding for Table contents in API [SCI-3376] 2019-05-15 13:12:54 +02:00
Oleksii Kriuchykhin
5b0e9872c3 Improve handling of CSRF token errors [SCI-2841] 2019-05-14 17:02:56 +02:00
Alex Kriuchykhin
311f499688
Merge pull request #1766 from okriuchykhin/ok_SCI_3459
Improve speed and error handling of TinyMceAssets migration task [SCI-3459]
2019-05-14 16:42:59 +02:00
Miha Mencin
13d126bc39
Merge pull request #1761 from mlorb/ml-sci-3456
Fix broken global activities team filter [SCI-3456]
2019-05-14 16:36:44 +02:00
Oleksii Kriuchykhin
2e8f664804 Improve speed and error handling of TinyMceAssets migration task [SCI-3459] 2019-05-14 16:30:05 +02:00
aignatov-bio
825e34e661
Fix inside click action in inline editing [SCI-3440] (#1765)
* Fix inside click action
2019-05-14 16:25:46 +02:00
aignatov-bio
d28d466dc9
Fix multiple confirm windows [SCI-3452] (#1763)
* Fix multiple confirm windows
2019-05-14 16:25:34 +02:00
aignatov-bio
4a753f8519
Fix user smart annotation fpr tinyMCE (#1759) 2019-05-14 15:02:12 +02:00
aignatov-bio
1555daa0c6
Fix non associated tinyMCE images (#1762)
* Fix non assosiated tinyMCE images
2019-05-14 15:01:57 +02:00
Mojca Lorber
54f735551c Fix broken global activities team filter 2019-05-14 13:50:10 +02:00
Alex Kriuchykhin
70c4094323
Merge pull request #1760 from okriuchykhin/ok_SCI_3381_v2
Fix processing_image_url for S3 storage [SCI-3381]
2019-05-14 13:15:28 +02:00
Oleksii Kriuchykhin
65fb4b1372 Fix processing_image_url for S3 storage [SCI-3381] 2019-05-14 12:53:35 +02:00
Anton Ignatov
8b11cec953 Fix wording in en 2019-05-14 09:52:41 +02:00
aignatov-bio
fe2a3c4ee6
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754)
* Add message when turbolinks change page with dirty tinuMCE
2019-05-14 09:49:00 +02:00
aignatov-bio
f970eea525
Some gui fixes (#1757) 2019-05-14 09:43:02 +02:00
Alex Kriuchykhin
e544edeaf7
Merge pull request #1758 from okriuchykhin/ok_SCI_3381
Fix handling of processing step attachments [SCI-3381]
2019-05-14 09:26:30 +02:00
Oleksii Kriuchykhin
4b1c4bd140 Fix handling of proccessing step attachments [SCI-3381] 2019-05-13 17:12:06 +02:00
Luka Murn
40ab883369
Merge pull request #1756 from Ducz0r/lm-sci-3426-fix-2
Refactor WOPI filename length validation onto the model [SCI-3426]
2019-05-13 16:12:55 +02:00
Miha Mencin
367ecba488
Merge pull request #1755 from mlorb/ml-sci-3349
Change author of copied inventory item [SCI-3349]
2019-05-13 15:54:38 +02:00