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

6569 commits

Author SHA1 Message Date
Oleksii Kriuchykhin caa2098550 Improve handling of empty cells in inventory imports [SCI-5094] 2020-10-12 14:42:47 +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
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 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
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
aignatov-bio 653fe6fb1d Fix markup 2020-09-24 11:56:17 +02:00
Urban Rotnik 3bda6a987d Fix smart annotation for RepositoryItem 2020-09-24 11:45:03 +02:00
Mojca Lorber f0a07acaf4 Some protocol repository CSS corrections 2020-09-23 20:54:49 +02:00
aignatov-bio b6f038ff09
Merge pull request #2863 from aignatov-bio/ai-sci-5037-update-regexp-for-smart-annotation 
Update regexp for smart annotation [SCI-5037]
 2020-09-23 16:39:24 +02:00
Urban Rotnik 3de2aee921
Merge pull request #2864 from urbanrotnik/ur-sci-4993 
Assign user to cloned experiment [SCI-4993]
 2020-09-23 13:37:07 +02:00
Urban Rotnik 33d53c958d
Merge pull request #2866 from urbanrotnik/ur-sci-5053 
Fix protocol import modal [SCI-5053]
 2020-09-23 13:19:23 +02:00
aignatov-bio 0865802255
Merge pull request #2853 from aignatov-bio/ai-sci-5024-disable-autostrip-on-status-change 
Disable autostrip attrbiutes on status change [SCI-5024]
 2020-09-23 13:18:07 +02:00
Urban Rotnik 7bc31905b5 Fix protocol import modal 2020-09-23 12:54:16 +02:00
aignatov-bio d719c26b6c Add error handling for MarvinJS 2020-09-23 12:26:26 +02:00
Urban Rotnik 5be7a1b32d Assign user to cloned experiment 2020-09-23 11:31:18 +02:00
aignatov-bio 21dcf1157c Update regexp for smart annotation 2020-09-23 11:13:59 +02:00
Oleksii Kriuchykhin 2cda80dc5f Add Endpoins for Project Membership manipulation [SCI-5001] 2020-09-23 11:03:29 +02:00
mlorb feda5622d8
Merge pull request #2860 from mlorb/ml-sci-5007 
Add info of the locked task to the View status flow modal [SCI-5007]
 2020-09-23 10:19:48 +02:00
aignatov-bio 7fa98de1da
Merge pull request #2859 from aignatov-bio/ai-sci-5036-fix-smart-annotation-cursor-position 
Fix smart annotation cursor position [SCI-5036]
 2020-09-23 10:11:13 +02:00
Mojca Lorber affae15ccf Simplification 2020-09-22 17:19:15 +02:00
mlorb 547af538b3
Merge pull request #2856 from mlorb/ml-sci-5009 
Update empty states for smart annotation results and dismiss button [SCI-5009]
 2020-09-22 15:31:22 +02:00
aignatov-bio bbfd4b1c02 Run autostrip when related field changed 2020-09-22 12:48:52 +02:00
aignatov-bio e288a1f911
Merge pull request #2861 from aignatov-bio/ai-sci-5038-prevent-tinymce-edit-mode-when-link-click 
Prevent tinymce edit mode when link click [SCI-5038]
 2020-09-22 11:41:50 +02:00
Mojca Lorber 8b3fce9656 Move it again 2020-09-22 11:38:32 +02:00
Mojca Lorber 0ad93d1288 Move close modal function to global event 2020-09-22 11:30:05 +02:00
aignatov-bio 2d667acdd1 Prevent tinymce edit mode when link click 2020-09-22 10:56:40 +02:00
Mojca Lorber fe779f9146 Add info of the locked task to the View status flow modal 2020-09-22 10:21:55 +02:00
aignatov-bio b540f90514
Merge pull request #2858 from aignatov-bio/ai-sci-5035-fix-smart-annotation-for-shared-inventories 
Add shared inventories to smart annotation [SCI-5035]
 2020-09-22 10:20:20 +02:00
Alex Kriuchykhin 136ce06022
Merge pull request #2851 from okriuchykhin/ok_SCI_4999 
Add Create and Update endpoints for experiments [SCI-4999]
 2020-09-22 10:20:00 +02:00
aignatov-bio fd7773a3dc Fix smart annotation cursor position 2020-09-22 10:15:01 +02:00