Commit graph

6274 commits

Author SHA1 Message Date
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
a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983)
* Fix report image issues

* Small fixes
2019-09-12 09:02:45 +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
aignatov-bio
fdce4e6c7c
Remove link to archived project page (#2037) 2019-09-09 10:43:08 +02:00
Oleksii Kriuchykhin
265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin
12d6804263
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen
SCI-3818-unshared-inventory-screen
2019-09-09 09:30:34 +02:00
mlorb
f6b9371649
Merge pull request #2038 from mlorb/ml-sci-update_version
Update version to 1.16.9
2019-09-06 15:15:58 +02:00
Mojca Lorber
adcd55b4aa Update version to 1.16.9 2019-09-06 15:12:27 +02:00
Miha Mencin
d522b3807a codestyle improvements 2019-09-06 14:59:30 +02:00
Miha Mencin
7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Oleksii Kriuchykhin
6f7ef25514 Add local sorting for ProtocolsIO [SCI-3827] 2019-09-05 14:49:16 +02:00
Miha Mencin
2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
Luka Murn
e719ba48a7
Merge pull request #2033 from Ducz0r/lm-fix-api-typos
Minor typo fix in RSpec tests
2019-09-05 11:33:32 +02:00
Luka Murn
bff4029e8d Minor typo fix in tests 2019-09-05 11:13:01 +02:00
aignatov-bio
15dc25cee9
Fix handson table initialization [SCI-3749] (#2021)
* Fix handson table initialization

* Fix markup
2019-09-05 08:35:28 +02:00
aignatov-bio
bc86d5bc40
Fix import items to inventory (#2019) 2019-09-05 08:35:11 +02:00
aignatov-bio
b8e68e02a1
Fix error, when cancel tag editing (#2025) 2019-09-05 08:34:33 +02:00
Alex Kriuchykhin
59a85d8181
Merge pull request #2004 from okriuchykhin/ok_SCI_3778
Fix new office file creation [SCI-3778]
2019-09-04 15:40:34 +02:00
Alex Kriuchykhin
77a1df0068
Merge pull request #2028 from okriuchykhin/ok_SCI_3817
Make previewable document filter more strict [SCI-3817]
2019-09-04 15:40:01 +02:00
mlorb
f5c8680f22
Merge pull request #2031 from mlorb/ml-sci-3819
Fix bug on API endpoint when creating result [SCI-3819]
2019-09-04 14:16:33 +02:00
Mojca Lorber
a312c0c4b8 fix bug on api endpoint when creating result 2019-09-04 13:41:06 +02:00
Luka Murn
fd99e49fac
Merge pull request #2029 from Ducz0r/lm-fix-failing-avatar-upload-test
Fix the failing Cucumber test for uploading avatar
2019-09-04 12:43:23 +02:00
Luka Murn
c7a4438bdd Fix the failing Cucumber test for uploading avatar 2019-09-04 11:18:14 +02:00
Oleksii Kriuchykhin
c65c0cf356 Make previewable document filter more strict [SCI-3817] 2019-09-04 10:39:04 +02:00
Oleksii Kriuchykhin
e58d3cf169 Implement Cucumber tests for direct upload [SCI-3771] 2019-09-03 15:14:37 +02:00
Luka Murn
0a8c101c7e
Change the cucumber test image asset 2019-09-03 14:34:42 +02:00
aignatov-bio
481be7b92e
Fix padding to share modal (#2024) 2019-09-03 12:06:16 +02:00
mlorb
ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
Oleksii Kriuchykhin
419a4c8e8c Update trim_html_tags Postgres function [SCI-3726] 2019-08-30 16:42:03 +02:00
Alex Kriuchykhin
6cc38de747
Merge pull request #2020 from okriuchykhin/ok_SCI_3803
Refactor inventory sharing logic [SCI-3803]
2019-08-30 13:20:01 +02:00
Oleksii Kriuchykhin
267c53c2d2 Refactor inventory sharing logic [SCI-3803] 2019-08-29 17:21:49 +02:00
aignatov-bio
d209b3abcd
Update share modal window [SCI-3812] (#2018)
* Update share modal window

* Fix markup
2019-08-29 13:45:27 +02:00
aignatov-bio
d3ccdbd83e
Create copy permission (#2017) 2019-08-29 13:39:22 +02:00