scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 21:21:50 +08:00
Code Issues Projects Releases Packages Wiki Activity
8485 commits 39 branches 184 tags 168 MiB
Commit graph

8485 commits

This branch
This branch
All branches
Author SHA1 Message Date
aignatov-bio
16249201f3 Fix markup 2020-10-28 16:44:28 +01:00
aignatov-bio
2f1217688c Add filer previews to reports 2020-10-28 16:32:22 +01:00
aignatov-bio
2d84a34cec
Merge pull request #2900 from aignatov-bio/ai-sci-5109-add-list-view-for-files 
Add list view to attachments [SCI-5109]
 2020-10-26 15:12:21 +01:00
aignatov-bio
6edcf4b099 Add size label 2020-10-26 15:10:06 +01:00
aignatov-bio
3fe3c2087f Fix hound issues 2020-10-16 11:27:23 +02:00
aignatov-bio
566ef7aef7 Add list view to atachments 2020-10-16 11:00:57 +02:00
aignatov-bio
016fc8a632 Merge branch 'features/office-file-previews' of https://github.com/biosistemika/scinote-web into features/office-file-previews 2020-10-15 15:25:54 +02:00
aignatov-bio
0a4b89cf39 Merge branch 'develop' into features/office-file-previews 2020-10-15 15:19:56 +02:00
aignatov-bio
a2bfb1cfeb Merge branch 'develop' of https://github.com/biosistemika/scinote-web into develop 2020-10-15 15:09:05 +02:00
aignatov-bio
cc70d42193 Merge branch 'ur-sci-5043' of https://github.com/urbanrotnik/scinote-web into develop 2020-10-15 11:21:03 +02:00
aignatov-bio
f1a5811d5f
Merge pull request #2809 from biosistemika/ai-sci-4960-render-wopi-preview-only-in-view-port 
Render wopi preview only in view port
 2020-10-14 21:29:56 +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
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
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
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
aignatov-bio
9d64121577 Refactor WOPI discovery 2020-09-29 12:58:05 +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