Oleksii Kriuchykhin
|
4639d4d1d0
|
Temporary disable Vips image processor [SCI-3881]
|
2019-09-17 16:25:37 +02:00 |
|
Anton Ignatov
|
63d62734ee
|
Fix routes for addons installer
|
2019-09-17 16:11:40 +02:00 |
|
Jure Grabnar
|
40aa1a37a2
|
Change colors of active buttons TinyMCE
Close SCI-3784
|
2019-09-17 15:45:27 +02:00 |
|
Urban Rotnik
|
f6d54321f1
|
Merge pull request #2059 from urbanrotnik/ur-sci-rubocop-fix
Add rubocop-rails gem
|
2019-09-17 14:28:16 +02:00 |
|
Urban Rotnik
|
e5933091d9
|
Add rubocop-rails gem
|
2019-09-17 13:42:43 +02:00 |
|
Oleksii Kriuchykhin
|
e12cd0ae9d
|
Fix autoloading issues [SCI-3881]
|
2019-09-17 10:50:01 +02:00 |
|
Alex Kriuchykhin
|
06dd43344f
|
Merge pull request #2054 from okriuchykhin/ok_SCI_3881
Merge branch 'master' [SCI-3881]
|
2019-09-16 14:57:54 +02:00 |
|
Mojca Lorber
|
47ccf38662
|
Redesign of sorting button for projects/experiments cards
|
2019-09-16 14:43:12 +02:00 |
|
Oleksii Kriuchykhin
|
0475394b08
|
Fix test [SCI-3881]
|
2019-09-16 13:03:41 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +02:00 |
|
Alex Kriuchykhin
|
f65edebaed
|
Merge pull request #2052 from okriuchykhin/ok_SCI_3745
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-16 11:25:31 +02:00 |
|
Oleksii Kriuchykhin
|
bc38c6b29e
|
Fix failing test [SCI-3745]
|
2019-09-16 10:26:13 +02:00 |
|
Oleksii Kriuchykhin
|
c068901b00
|
Upgrade Rails to 6.0 [SCI-3745]
|
2019-09-12 17:24:08 +02:00 |
|
Alex Kriuchykhin
|
9512b448e6
|
Merge pull request #2027 from okriuchykhin/ok_SCI_3771
Implement Cucumber tests for direct upload [SCI-3771]
|
2019-09-12 15:34:28 +02:00 |
|
Alex Kriuchykhin
|
5f3b1b207b
|
Merge pull request #2008 from okriuchykhin/ok_SCI_3786
Fix cucumber tests, switch to chromium-driver [SCI-3786]
|
2019-09-12 15:34:14 +02:00 |
|
Alex Kriuchykhin
|
0d6f011e61
|
Merge pull request #2006 from okriuchykhin/ok_SCI_3765
Add path method to custom ActiveStorage S3 service [SCI-3765]
|
2019-09-12 15:34:03 +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
|
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 |
|