aignatov-bio
|
540b6ab789
|
Merge pull request #2914 from aignatov-bio/ai-sci-5052-fix-label-font-size-for-status-label
Fix font size and font weight for status label [SCI-5052]
|
2020-10-26 14:01:37 +01:00 |
|
aignatov-bio
|
bddd1956ab
|
Fix font size and font weight for status label
|
2020-10-26 12:35:40 +01:00 |
|
Urban Rotnik
|
b23f110184
|
Merge pull request #2905 from urbanrotnik/ur-sci-5085-active-filters
Add mark for active filters [SCI-5085]
|
2020-10-25 16:06:59 +01:00 |
|
Urban Rotnik
|
c5a1d34c36
|
Merge pull request #1967 from jbargu/jg_sci_2228
[SCI-2228] Remove samples, sample types, sample groups, custom sample columns from the codebase
|
2020-10-23 15:33:22 +02:00 |
|
Urban Rotnik
|
75351a3aed
|
px to em
|
2020-10-23 14:11:56 +02:00 |
|
Urban Rotnik
|
6ccd34291d
|
Merge pull request #2904 from urbanrotnik/ur-sci-5093
Fix smart annotation in checklist title [SCI-5093]
|
2020-10-23 13:36:22 +02:00 |
|
Urban Rotnik
|
d43d487d33
|
Merge pull request #2907 from urbanrotnik/ur-sci-5045-remove-border
Remove border, update copy [SCI-5045]
|
2020-10-23 13:35:57 +02:00 |
|
Urban Rotnik
|
1089e7e4fd
|
Merge branch 'jg_sci_2228' of github.com:jbargu/scinote-web into jg_sci_2228
|
2020-10-22 14:27:32 +02:00 |
|
Urban Rotnik
|
aa1520bfb8
|
Merge branch 'develop' into jg_sci_2228
|
2020-10-22 14:21:39 +02:00 |
|
Urban Rotnik
|
2f99e3a464
|
Remove border, update copy
|
2020-10-21 09:58:35 +02:00 |
|
Urban Rotnik
|
e7d2d78935
|
Add mark for active filters
|
2020-10-20 16:45:54 +02:00 |
|
Urban Rotnik
|
a728ba2f2d
|
Fix smart annotation in checklist title
|
2020-10-20 13:02:49 +02:00 |
|
Miha Mencin
|
c8083f730c
|
Merge pull request #2899 from biosistemika/release/1.20.2
Release/1.20.2
|
2020-10-16 09:01:45 +02:00 |
|
Urban Rotnik
|
e1e7496307
|
Merge pull request #2884 from urbanrotnik/ur-sci-5043
DOCX lists [SCI-5043]
|
2020-10-15 11:53:58 +02:00 |
|
Urban Rotnik
|
e748e1eff3
|
Fix smart annotations and links styling
|
2020-10-14 17:58:07 +02:00 |
|
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 |
|
Mojca Lorber
|
5013f224ee
|
Fix ems
|
2020-10-14 13:16: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 |
|
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
|
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 |
|
Miha Mencin
|
087e18fedd
|
Bump the version to 1.12.1
|
2020-10-06 16:41:56 +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
|
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 |
|
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 |
|
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 |
|
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 |
|