Commit graph

5726 commits

Author SHA1 Message Date
Oleksii Kriuchykhin
2842ea381e Fix tests for health check endpoint [SCI-3522] 2019-05-31 16:48:10 +02:00
Anton Ignatov
db8060bc01 remove wrong files 2019-05-31 16:03:24 +02:00
Anton Ignatov
5df55d39be Fix nil issue in module controller 2019-05-31 16:02:21 +02:00
Oleksii Kriuchykhin
552f69b9b1 Add system notifications service to health check endpoint [SCI-3522] 2019-05-31 15:52:47 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
Luka Murn
98234287f5 Fix failing permission_eval_spec test 2019-05-31 10:33:55 +02:00
Luka Murn
b21bdddf15 Rename permision_eval - permission_eval
Hopefully this will help with getting rid of all the errors
that we've been receiving for PermissionEval.

Closes SCI-2991.
2019-05-31 09:56:54 +02:00
aignatov-bio
94b220172d
Fix empty result name issue (#1812) 2019-05-31 09:48:58 +02:00
aignatov-bio
3681df7b9f
Fix scroll issue in repository column editor (#1813) 2019-05-31 09:48:45 +02:00
Alex Kriuchykhin
27ccf7b8fe
Merge pull request #1803 from okriuchykhin/ok_SCI_3412
Add additional checks for inventory state objects [SCI-3412]
2019-05-30 16:09:13 +02:00
Alex Kriuchykhin
75f122aa15
Merge pull request #1809 from okriuchykhin/ok_SCI_3506
Fix import of ELN protocols [SCI-3506]
2019-05-30 16:08:27 +02:00
Miha Mencin
7ec2690e46
Merge pull request #1811 from biosistemika/hotfix-may
Update VERSION
2019-05-30 16:08:05 +02:00
mlorb
111c062981
Merge pull request #1802 from mlorb/ml-sci-3470
Hide create office file button to user without permission [SCI-3470]
2019-05-30 14:27:19 +02:00
Alex Kriuchykhin
c49dbe5c44
Merge pull request #1810 from okriuchykhin/ok_SCI_3511
Fix RTE editor initialization for new step in protocol [SCI-3511]
2019-05-30 12:54:36 +02:00
Miha Mencin
ef107d98c7 Update VERSION 2019-05-30 11:43:24 +02:00
Oleksii Kriuchykhin
d061aec5cd Fix RTE editor initialization for new step in protocol [SCI-3511] 2019-05-29 18:33:20 +02:00
Oleksii Kriuchykhin
6917ea56e8 Fix import of ELN protocols [SCI-3506] 2019-05-29 15:41:54 +02:00
Alex Kriuchykhin
f68b69ae02
Merge pull request #1806 from okriuchykhin/ok_SCI_3507
Fix step numbering update on reposition [SCI-3507]
2019-05-29 15:34:45 +02:00
Mojca Lorber
ca4d8e71bb fix some css on step panel heading 2019-05-29 13:56:55 +02:00
Oleksii Kriuchykhin
2c9ced0c75 Fix step numbering update on reposition [SCI-3507] 2019-05-29 12:20:35 +02:00
Oleksii Kriuchykhin
0fd7a4e8f1 Fix failing tests [SCI-3412] 2019-05-27 17:32:21 +02:00
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
Mojca Lorber
a3c29738bb Hide create office file button to user without permission 2019-05-27 14:58:10 +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
Oleksii Kriuchykhin
84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +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