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

5653 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksii Kriuchykhin 5a9640c5d1 Add aditional checks for inventory state objects [SCI-3412] 2019-05-27 17:32:21 +02:00
aignatov-bio 0b3b6d593b
Small style fixes [SCI-3498] (#1799) 
* Adding error, if TinyMCE asset not in text, when we copy anything

* Small style fixes
 2019-05-27 16:27:27 +02:00
Jure Grabnar 71aa39eed2
Merge pull request #1653 from jbargu/jg_sci_3140_migrate_mails 
Migrate emails from billing to common addons, update styling [SCI-3140]
 2019-05-24 17:49:58 +02:00
Luka Murn d7fe23c6ce
Merge pull request #1796 from Ducz0r/lm-sci-3494 
Fix the user.activities association so it works [SCI-3494]
 2019-05-24 14:21:42 +02:00
Jure Grabnar e72a2fc7d1 Add deprecated comments to system_message_notification 2019-05-23 13:44:08 +02:00
Miha Mencin d2991bc1d2
Update VERSION 2019-05-23 10:06:06 +02:00
Luka Murn 3a2bf2ce8a
Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup 
Add a startup check for WOPI_ENABLED == true variables
 2019-05-22 16:56:55 +02:00
Luka Murn 5c88e9ab7e Fix 'if..' logic to work properly when WOPI_ENABLED is undefined 2019-05-22 16:36:23 +02:00
aignatov-bio 0f86ebf173
Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] (#1797) 
* Adding error, if TinyMCE asset not in text, when we copy anything
 2019-05-22 16:13:40 +02:00
Luka Murn 8b116d9de7 Fix the user.activities association so it works 
Closes SCI-3494.
 2019-05-22 15:42:50 +02:00
aignatov-bio 8f2d873130
Fix error when editing office document (#1793) 2019-05-22 10:34:16 +02:00
aignatov-bio fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
aignatov-bio da33a053cf
Fix avatar image position on global activities (#1792) 2019-05-22 10:21:18 +02:00
aignatov-bio 2cee46a10d
Fix experiment name length (#1789) 2019-05-21 15:54:01 +02:00
aignatov-bio d97e803d01
Adding placeholder to TinyMCE editor (#1788) 2019-05-21 15:53:47 +02:00
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