scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 15:36:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
8468 commits 70 branches 179 tags 165 MiB
Commit graph

8468 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik a87302a183 Include styled text in list items elements 2020-10-21 08:27:10 +02:00
aignatov-bio f43d72cd00
Merge pull request #2903 from aignatov-bio/ai-sci-5116-update-image-for-doorkeeper-auth 
Update image for doorkeeper auth [SCI-5116]
 2020-10-19 17:20:33 +02:00
aignatov-bio 2968e677b8 Update image for doorkeeper auth 2020-10-19 16:23:20 +02:00
Miha Mencin c31a7373fb
Merge pull request #2902 from mlorb/ml-sci-5089 
Add 'Open in APP' button to the task
 2020-10-19 12:28:35 +02:00
Mojca Lorber 23f01ac6a9 Add 'Open in APP' button to the task 2020-10-19 12:17:03 +02:00
Alex Kriuchykhin df935ba3cd
Merge pull request #2898 from urbanrotnik/ur-sci-5071 
Move snapshot default selection from addon to core [SCI-5071]
 2020-10-16 09:02:56 +02:00
Urban Rotnik d88040fd1b Move snapshot default selection to core from addon 2020-10-15 15:21:44 +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
Oleksii Kriuchykhin 25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio 16fe11f0f7 Fix smitch team on link for object from other team 2020-09-28 17:16:18 +02:00
aignatov-bio 7c3a3e4490 Small smart annotation fixes 2020-09-28 12:03:01 +02:00
Alex Kriuchykhin ec48a4dc27
Merge pull request #2834 from biosistemika/dependabot/npm_and_yarn/http-proxy-1.18.1 
Bump http-proxy from 1.17.0 to 1.18.1
 2020-09-25 15:06:18 +02:00
Alex Kriuchykhin fb28fa557b
Merge pull request #2872 from okriuchykhin/ok_SCI_5062 
Improve performance of fetching of statuses [SCI-5062]
 2020-09-25 15:00:30 +02:00
Alex Kriuchykhin 3eb448c39b
Merge pull request #2862 from okriuchykhin/ok_SCI_5001 
Add Endpoins for Project Membership manipulation [SCI-5001]
 2020-09-25 14:25:20 +02:00