scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-25 01:16:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
8483 commits 69 branches 179 tags 165 MiB
Commit graph

6598 commits

Author SHA1 Message Date
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
Mojca Lorber 5013f224ee Fix ems 2020-10-14 13:16:38 +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
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
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
Oleksii Kriuchykhin 6c367428a1 Fix team switcher [SCI-5080] 2020-10-02 14:25:44 +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
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 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 9d64121577 Refactor WOPI discovery 2020-09-29 12:58:05 +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
aignatov-bio cd9b143bc5 Fix markup 2020-09-25 15:08:20 +02:00
aignatov-bio 1ed65eddfa Move ordering to front-end 2020-09-25 15:06:09 +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
Oleksii Kriuchykhin 134e549ed5 Improve performance of fetching of statuses [SCI-5062] 2020-09-25 10:14:57 +02:00
Urban Rotnik f4f0bc706a Fix step deletion 2020-09-25 08:43:03 +02:00
Mojca Lorber 94fea75fda Fix at long inventory name snapshot in title is not visible 2020-09-24 17:19:41 +02:00
aignatov-bio 70a0da17b2 Fix markup 2020-09-24 17:12:53 +02:00
aignatov-bio 780db9d134 Add assets view switcher 2020-09-24 17:10:36 +02:00
Alex Kriuchykhin d02d48f10f
Merge pull request #2869 from aignatov-bio/ai-sci-5038-fix-smart-annotaion-link-for-inventory-items 
Improve smart annotation in TinyMCE fields [SCI-5038]
 2020-09-24 14:11:59 +02:00
mlorb acda21f357
Merge pull request #2867 from mlorb/ml-sci-4578-v2 
Some protocol repository CSS corrections [SCI-4578]
 2020-09-24 13:44:06 +02:00
aignatov-bio 4f7814cff4 Fix markup 2020-09-24 13:32:43 +02:00
aignatov-bio 9da27956d3
Merge pull request #2857 from aignatov-bio/ai-sci-4987-fix-smart-annotation-for-archived-projects 
Show smart annotation for archived projects/experiments [SCI-4987]
 2020-09-24 13:29:49 +02:00
aignatov-bio ff33cb45e0 Improve smart annotation in TinyMCE fields 2020-09-24 13:29:20 +02:00