Commit graph

6141 commits

Author SHA1 Message Date
Jure Grabnar
096228abbb Shorten padding format in scss 2019-09-30 14:32:09 +02:00
Jure Grabnar
070c307721 Implement style changes suggested by Anton 2019-09-30 14:27:00 +02:00
Jure Grabnar
8441c5b6ed Add anchor to result text editing 2019-09-30 11:34:39 +02:00
Jure Grabnar
477e41a96d Refactor I18n strings for tiny_mce 2019-09-30 11:34:39 +02:00
Jure Grabnar
289853e2e8 Do not remove draft on step cancel (temporary)
Close SCI-3751
2019-09-30 11:34:39 +02:00
Jure Grabnar
b3cafcec7c Add restore draft notification to all models
Close SCI-3751
2019-09-30 11:34:39 +02:00
Jure Grabnar
0a36372321 Fix placeholder positioning 2019-09-30 11:34:39 +02:00
Jure Grabnar
b286e4adfd Fix styles for notification bar 2019-09-30 11:34:39 +02:00
Jure Grabnar
4f2182e2f5 Remove restoredraft icon 2019-09-30 11:34:39 +02:00
Jure Grabnar
6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
Jure Grabnar
e24541ae51
Merge pull request #2087 from jbargu/jg_sci_3870
[SCI-3870] Change/fix asset locking mechanism
2019-09-30 08:48:39 +02:00
Jure Grabnar
0a3389f310 Fix operator for removing the lock on asset 2019-09-30 08:46:16 +02:00
mlorb
594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637
Redesign of sorting button for projects/experiments cards [SCI-3637]
2019-09-27 12:44:44 +02:00
mlorb
2fd9345616
Merge pull request #2068 from mlorb/ml-sci-3816
Fix reloading of datatables header [SCI-3816]
2019-09-27 10:29:32 +02:00
Jure Grabnar
0c24210f6a
[SCI-3784] Small RTF improvements (#2061)
[SCI-3784] Small RTF improvements
2019-09-27 10:27:57 +02:00
Luka Murn
39b3868680
Merge pull request #2093 from Ducz0r/lm-active-mailer-config-minor-changes
ActiveMailer minor config changes
2019-09-27 10:17:05 +02:00
mlorb
e3b0e149b6
Merge pull request #2077 from mlorb/ml-sci-3764
Expand clickable area of links in secondary navigation [SCI-3764]
2019-09-27 10:15:12 +02:00
mlorb
495d57b607
Merge pull request #2078 from mlorb/ml-sci-3906
Fix bug with inventory navigation height [SCI-3906]
2019-09-27 10:14:25 +02:00
mlorb
246634dbc4
Merge pull request #2069 from mlorb/ml-sci-3796
Fix inventory item selection when previewing file [SCI-3796]
2019-09-27 10:13:35 +02:00
Luka Murn
a552356bfe Minor comment text update 2019-09-25 13:16:16 +02:00
Luka Murn
093c6e37bc Minor restructure/comment changes to ActionMailer config 2019-09-25 11:58:52 +02:00
Jure Grabnar
5cb900370a Change/fix asset locking mechanism
Close SCI-3870
2019-09-25 11:07:53 +02:00
Jure Grabnar
37abc992f7
Merge pull request #2084 from jbargu/jg_sci_3821
Add tables functionality in tinymce
2019-09-24 12:45:19 +02:00
Jure Grabnar
ae83ef749f Add tables functionality in tinymce
Close SCI-3821
2019-09-24 12:44:00 +02:00
Mojca Lorber
a85c80d994 Fix bug with inventory navigation height 2019-09-23 16:12:41 +02:00
Mojca Lorber
9f30e05594 Expand clickable area of links in secondary navigation 2019-09-23 14:34:48 +02:00
Mojca Lorber
4263edf0cc Fix inventory item selection when previewing file 2019-09-18 15:08:40 +02:00
Mojca Lorber
4d4a275c0d Fix reloading of datatables header 2019-09-18 14:28:29 +02:00
Jure Grabnar
40aa1a37a2 Change colors of active buttons TinyMCE
Close SCI-3784
2019-09-17 15:45:27 +02:00
Mojca Lorber
47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Alex Kriuchykhin
7f415a551d
Merge pull request #2050 from okriuchykhin/release_1_16_10
Bump version to 1.16.10
2019-09-12 10:48:52 +02:00
Oleksii Kriuchykhin
816d48f0e0 Bump version to 1.16.10 2019-09-12 10:47:54 +02:00
aignatov-bio
c4e8e8ed07
Revert "Fix formulas in project export (#2047)" (#2049)
This reverts commit 36ae7d05f9.
2019-09-12 10:45:43 +02:00
aignatov-bio
36ae7d05f9
Fix formulas in project export (#2047) 2019-09-12 08:43:59 +02:00
aignatov-bio
07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio
40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +02:00
aignatov-bio
27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
Luka Murn
d39d2e1cac
Merge pull request #2045 from Ducz0r/lm-update-canaid-reference
Update canaid Gem reference in Gemfile to use tags, not master
2019-09-11 10:39:35 +02:00
Luka Murn
82248a6d92 Update canaid Gem reference in Gemfile to use tags, not master 2019-09-10 18:04:04 +02:00
mlorb
cf8c98dfa3
Merge pull request #2042 from biosistemika/hotfix-september
Hotfix september
2019-09-10 13:53:28 +02:00
mlorb
e596afa595
Merge pull request #2041 from mlorb/ml-sci-3847
Fix missing icon on shared inventories in global search [SCI-3847]
2019-09-10 13:51:58 +02:00
aignatov-bio
1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Mojca Lorber
e8f24b18e2 Fix missing icon on shared inventories in global search 2019-09-10 11:20:18 +02:00
Miha Mencin
33d495956e
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen
adding missing file
2019-09-09 16:47:47 +02:00
Miha Mencin
01628e1efc adding missing file 2019-09-09 16:46:51 +02:00
aignatov-bio
01d6a17f2b
Fix permission check for inventory (#2039) 2019-09-09 15:11:18 +02:00
Alex Kriuchykhin
6a17667d39
Merge pull request #2023 from okriuchykhin/ok_SCI_3726
Update trim_html_tags Postgres function [SCI-3726]
2019-09-09 11:18:57 +02:00
Alex Kriuchykhin
b8a5b1b542
Merge pull request #2036 from okriuchykhin/ok_SCI_3815
Improve behavior of inventory items export modal [SCI-3815]
2019-09-09 11:08:02 +02:00
Alex Kriuchykhin
1714212630
Merge pull request #2035 from okriuchykhin/ok_SCI_3827
Add local sorting for ProtocolsIO [SCI-3827]
2019-09-09 10:55:22 +02:00
aignatov-bio
16ae00782a
Fix new step button on empty task [SCI-3826] (#2026)
* Fix new step button on empty task

* Fix markup
2019-09-09 10:43:38 +02:00