Oleksii Kriuchykhin
|
e12cd0ae9d
|
Fix autoloading issues [SCI-3881]
|
2019-09-17 10:50:01 +02:00 |
|
Oleksii Kriuchykhin
|
3509543e7b
|
Merge branch 'master' into ok_SCI_3881
|
2019-09-16 11:56:49 +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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Mojca Lorber
|
a312c0c4b8
|
fix bug on api endpoint when creating result
|
2019-09-04 13:41:06 +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
|
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 |
|
aignatov-bio
|
4d20cd7d55
|
Fix copy inventory permission (#2016)
|
2019-08-26 14:48:38 +02:00 |
|
Miha Mencin
|
0058198bb5
|
Merge branch 'master' into SCI-3806-shared-status-dropdown
|
2019-08-26 11:55:25 +02:00 |
|
mlorb
|
ffe06d5070
|
Merge pull request #2010 from mlorb/ml-sci-3805
Add a team name to inventory item card [SCI-3805]
|
2019-08-26 11:29:12 +02:00 |
|
aignatov-bio
|
66326d90e5
|
Fix shared icon show/hidden (#2014)
|
2019-08-26 11:24:22 +02:00 |
|
Miha Mencin
|
a7bb7a1dd8
|
additional checking for icon: check also if user is guest
|
2019-08-26 11:20:18 +02:00 |
|
aignatov-bio
|
b3e3c443f0
|
Fix big gap in title of navbar (#2015)
|
2019-08-26 11:20:03 +02:00 |
|
Miha Mencin
|
b850efbceb
|
Code review remarks, added tooltip for unshared inventory
|
2019-08-26 10:45:40 +02:00 |
|
aignatov-bio
|
5bf3a5d418
|
Fix sharing check in service [SCI-3798] (#2011)
* Update shared inventory permissions
* Fix tests and simplify condition for placeholder
* Fix sharing check in service
* Fix rebase conflicts
|
2019-08-26 09:36:41 +02:00 |
|
Miha Mencin
|
9e9e698778
|
SCI-3806 Add an icon indicating shared status to dropdown
|
2019-08-26 09:14:37 +02:00 |
|
aignatov-bio
|
96e132c62e
|
Hide share button for users with one team (#2005)
|
2019-08-23 11:29:03 +02:00 |
|
aignatov-bio
|
5515bac773
|
Add assigned items from shared inventories to report (#2002)
|
2019-08-23 11:28:09 +02:00 |
|
Mojca Lorber
|
50c78f182c
|
Add a team name to inventory item card
|
2019-08-23 11:13:58 +02:00 |
|