mlorb
|
83ba40d135
|
Merge pull request #2870 from mlorb/ml-sci-4841
Fix at long inventory name snapshot in title is not visible [SCI-4841]
|
2020-10-14 14:38:04 +02:00 |
|
aignatov-bio
|
143b4077db
|
Fix tests
|
2020-10-14 14:25:50 +02:00 |
|
Mojca Lorber
|
5013f224ee
|
Fix ems
|
2020-10-14 13:16:38 +02:00 |
|
aignatov-bio
|
e240b629c4
|
Fix rubocop issues
|
2020-10-14 12:12:32 +02:00 |
|
aignatov-bio
|
36bab10de7
|
Update export all to tree structure
|
2020-10-14 12:08:04 +02:00 |
|
aignatov-bio
|
c0102338e0
|
Merge pull request #2879 from aignatov-bio/ai-sci-4957-update-discover-for-wopi
Refactor WOPI discovery [SCI-4957]
|
2020-10-14 09:32:38 +02:00 |
|
Alex Kriuchykhin
|
d5499168f3
|
Merge pull request #2896 from biosistemika/features/pwa
Merge features/pwa to develop
|
2020-10-13 16:34:57 +02:00 |
|
Urban Rotnik
|
a19e0ef846
|
Refactor
|
2020-10-13 14:23:39 +02:00 |
|
Urban Rotnik
|
1b860afe30
|
Move TinyMCE parser to separate class
|
2020-10-13 09:45:13 +02:00 |
|
Urban Rotnik
|
ae8b2cbf8f
|
Add text to I18n
|
2020-10-13 08:37:32 +02:00 |
|
Mojca Lorber
|
a944525d25
|
Change px to em
|
2020-10-12 16:59:33 +02:00 |
|
Alex Kriuchykhin
|
43e94ea84c
|
Merge pull request #2894 from okriuchykhin/ok_SCI_5094
Improve handling of empty cells in inventory imports [SCI-5094]
|
2020-10-12 16:53:09 +02:00 |
|
aignatov-bio
|
a7da7b0de3
|
Refactor export all my module generator
|
2020-10-12 15:55:06 +02:00 |
|
Mojca Lorber
|
cf367baefa
|
Merge branch 'develop' into ml-sci-4841
|
2020-10-12 14:43:03 +02:00 |
|
Oleksii Kriuchykhin
|
caa2098550
|
Improve handling of empty cells in inventory imports [SCI-5094]
|
2020-10-12 14:42:47 +02:00 |
|
Urban Rotnik
|
274293348e
|
Clean up
|
2020-10-09 09:53:27 +02:00 |
|
Urban Rotnik
|
dfca798e2d
|
Refactored tiny_mce_table parser and renderer
|
2020-10-09 09:43:36 +02:00 |
|
Urban Rotnik
|
92b4d95c72
|
Implement lists in DOCX
|
2020-10-09 09:43:00 +02:00 |
|
Miha Mencin
|
1acf9a30a2
|
Merge pull request #2893 from biosistemika/develop
Release merge
|
2020-10-07 09:33:50 +02:00 |
|
miha
|
a3dab81dc9
|
Bump version to 1.20.1
|
2020-10-07 09:31:40 +02:00 |
|
Miha Mencin
|
109dabafb2
|
Bump the version to 1.20.1
|
2020-10-07 09:30:05 +02:00 |
|
aignatov-bio
|
b656592124
|
Merge pull request #2886 from aignatov-bio/ai-sci-5074-update-dashboard-layout
Refactor dashboard layout [SCI-5074]
|
2020-10-07 09:16:06 +02:00 |
|
Miha Mencin
|
41b235e72a
|
Merge pull request #2892 from biosistemika/develop
Version 1.20.1
|
2020-10-07 08:27:27 +02:00 |
|
Miha Mencin
|
087e18fedd
|
Bump the version to 1.12.1
|
2020-10-06 16:41:56 +02:00 |
|
aignatov-bio
|
5d6c9e78fd
|
Refactor dashboard layout
|
2020-10-06 16:09:26 +02:00 |
|
Miha Mencin
|
632c9c1fb4
|
Merge pull request #2890 from okriuchykhin/ok_SCI_5067
Fix protocol repository save/load timestamps [SCI-5067]
|
2020-10-06 15:38:19 +02:00 |
|
Oleksii Kriuchykhin
|
7cd12bfb07
|
Fix protocol repository save/load timestamps [SCI-5067]
|
2020-10-06 15:30:04 +02:00 |
|
Miha Mencin
|
2f145bb04e
|
Merge pull request #2889 from biosistemika/develop
HOTFIX for empty team case
|
2020-10-06 13:43:31 +02:00 |
|
Miha Mencin
|
3a4a166856
|
Merge pull request #2888 from okriuchykhin/ok_SCI_5082
Fix index page for users without a team [SCI-5082]
|
2020-10-05 10:16:04 +02:00 |
|
Oleksii Kriuchykhin
|
dd64206b25
|
Fix index page for users without a team [SCI-5082]
|
2020-10-02 16:57:46 +02:00 |
|
Mojca Lorber
|
4e4a4a2c4e
|
Change Complete step button on task step
|
2020-10-02 15:02:42 +02:00 |
|
Alex Kriuchykhin
|
dc6ee42e1d
|
Merge pull request #2885 from okriuchykhin/ok_SCI_5080
Fix team switcher [SCI-5080]
|
2020-10-02 14:57:29 +02:00 |
|
Oleksii Kriuchykhin
|
6c367428a1
|
Fix team switcher [SCI-5080]
|
2020-10-02 14:25:44 +02:00 |
|
Alex Kriuchykhin
|
4bc68f5eab
|
Merge pull request #2883 from biosistemika/features/local
Merge features/local to develop
|
2020-10-01 12:57:45 +02:00 |
|
Oleksii Kriuchykhin
|
aeba25cf09
|
Fix Hound warning
|
2020-10-01 11:56:33 +02:00 |
|
Oleksii Kriuchykhin
|
21fab4198c
|
Merge branch 'develop' into features/local
|
2020-10-01 11:52:59 +02:00 |
|
Urban Rotnik
|
fc8704b520
|
Add fileUtils for sizeCheck, add url to textarea data attribute
|
2020-09-30 13:20:11 +02:00 |
|
Oleksii Kriuchykhin
|
9f2c1841e8
|
Merge branch 'develop' into master
|
2020-09-30 11:00:44 +02:00 |
|
Oleksii Kriuchykhin
|
9150b47661
|
Bump version to 1.20.0
|
2020-09-30 10:59:59 +02:00 |
|
aignatov-bio
|
9010f9c1db
|
Merge pull request #2876 from aignatov-bio/ai-sci-5066-fix-switch-team
Fix switch team on link for object from other team [SCI-5066]
|
2020-09-30 10:09:19 +02:00 |
|
Urban Rotnik
|
e9ac999645
|
Merge pull request #2880 from urbanrotnik/ur-sci-5067-protocols-sync
Fix updating updated_at on protocol while load/sync with repository [SCI-5067]
|
2020-09-29 16:54:42 +02:00 |
|
Urban Rotnik
|
7c312a844f
|
Fix updating updated_at on protocol while load/sync with repository
|
2020-09-29 15:37:40 +02:00 |
|
aignatov-bio
|
cfc943c0ac
|
Merge pull request #2882 from aignatov-bio/ai-sci-5072-remove-complete-step-from-protocol-managment
Remove complete step button from protocol managment [SCI-5072]
|
2020-09-29 15:20:48 +02:00 |
|
aignatov-bio
|
d21aee1843
|
Remove complete step button from protocol managment
|
2020-09-29 15:08:01 +02:00 |
|
Alex Kriuchykhin
|
939c0096de
|
Merge pull request #2881 from biosistemika/features/yomu
Switch to a new version of Yomu gem
|
2020-09-29 14:41:36 +02:00 |
|
Oleksii Kriuchykhin
|
1603ec6d1a
|
Switch to a new version of Yomu gem
|
2020-09-29 13:11:50 +02:00 |
|
aignatov-bio
|
c53753b294
|
Merge pull request #2873 from aignatov-bio/ai-sci-5038-small-smart-annotation-fixes
Small smart annotation fixes [SCI-5038]
|
2020-09-29 13:06:58 +02:00 |
|
aignatov-bio
|
9d64121577
|
Refactor WOPI discovery
|
2020-09-29 12:58:05 +02:00 |
|
Urban Rotnik
|
dc0072e707
|
Support multiple file upload in TinyMCE fields
|
2020-09-29 08:21:31 +02:00 |
|
Alex Kriuchykhin
|
6357c23350
|
Merge pull request #2877 from okriuchykhin/local_fonts
Add typeface-lato for shipping Lato fonts
|
2020-09-28 18:04:53 +02:00 |
|