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

5911 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Urban Rotnik 0ee2afae29
Merge pull request #1913 from urbanrotnik/ur-sci-3657-log-errors 
Log to console when error occur on ProtocolsImport actions [SCI-3657]
 2019-07-10 09:01:01 +02:00
Urban Rotnik cc3cd43270 Log to console when error occur on ProtocolsImport actions 2019-07-09 15:32:43 +02:00
mlorb f2690883aa
Merge pull request #1898 from mlorb/ml-sci-3634 
Fixes visual bugs on protocols.io and home page [SCI-3634]
 2019-07-09 14:38:19 +02:00
mlorb 23270393b0
Merge branch 'master' into ml-sci-3634 2019-07-09 14:38:00 +02:00
Mojca Lorber 7bb82e2fc2 Fix eternal protocols tab visuals 2019-07-09 14:35:40 +02:00
aignatov-bio 1a75a31647
Remove webinar button [SCI-3664] (#1906) 
* Remove webinar button

* Remove constants and i18n
 2019-07-09 14:01:09 +02:00
aignatov-bio fc78d8f401
Fix tooltip position (#1909) 2019-07-09 14:00:53 +02:00
Urban Rotnik 0ac972ffbd
Merge pull request #1910 from urbanrotnik/ur-sci-3656 
Fix styling for StepComponents in step description [SCI-3656]
 2019-07-09 13:42:34 +02:00
Urban Rotnik 10639deb97 Strip tags for table's content 2019-07-09 13:41:52 +02:00
Urban Rotnik be77746aef Fix description styling of components 2019-07-09 13:41:51 +02:00
Urban Rotnik 8411e92fa2 Add linebreak for 'There was a table' message 2019-07-09 10:54:48 +02:00
Jure Grabnar 05f2210002
SCI-3650, SCI-3655 Fix empty file name, empty description when… (#1892) 
SCI-3650, SCI-3655 Fix empty file name, empty description when parsing tables
 2019-07-09 10:24:03 +02:00
aignatov-bio c8b0d87054
Fix global links in reports (#1894) 2019-07-09 09:35:43 +02:00
aignatov-bio 4fe3119bd2
Fix step description RTE images in report preview (#1888) 2019-07-08 15:23:44 +02:00
mlorb 7272d838b6
Merge pull request #1875 from mlorb/ml-sci-3618 
Remove unassign_user_from_project notification…[SCI-3618]
 2019-07-08 15:23:06 +02:00
aignatov-bio 01a01157d3
Replace Handson table in reports with simple table [SCI-3636] (#1895) 
* Replace handsone table in reports with simple table

* Add result tables
 2019-07-08 13:19:12 +02:00
Jure Grabnar bdd1ca2a65
Merge pull request #1908 from jbargu/jg_sci_3587 
[SCI-3587] Endless spinner at file preview
 2019-07-08 13:06:39 +02:00
Jure Grabnar ae7da78bff
Merge pull request #1897 from jbargu/jg_sci_3646 
[SCI-3646] Add paging functionality to external protocols
 2019-07-08 13:06:19 +02:00
aignatov-bio 81aef81634
Fix scrol jump when select activtiies in global activities (#1907) 2019-07-08 12:55:35 +02:00
aignatov-bio 6d423ed986
Make Navbar icons bigger [SCI-3663] (#1900) 
* Make Navbar icons bigger
 2019-07-08 12:53:43 +02:00
aignatov-bio 2baca019eb
Remove tooltip from step edit button (#1905) 2019-07-08 12:52:03 +02:00
aignatov-bio 99b1075c28
Fix protcol naming when load multiple protocols (#1904) 2019-07-08 12:51:47 +02:00
aignatov-bio 0d1ec0d4ed
Fix I18n and constants in DOCX report (#1901) 2019-07-08 12:51:26 +02:00
Miha Mencin ab9b7a7429
Merge pull request #1902 from biosistemika/release-1.16.6 
Merge 'release-1.16.6' into 'master'
 2019-07-08 12:49:40 +02:00
Jure Grabnar 0ee0b1c834 Fix file preview not showing in modal when processing is done 
Close SCI-3587
 2019-07-08 12:45:22 +02:00
Alex Kriuchykhin 82708f0124
Merge pull request #1891 from okriuchykhin/ok_SCI_3654 
Fix project page view saving [SCI-3654]
 2019-07-08 11:46:54 +02:00
aignatov-bio 291563c80e
Fix tests for 1.16.6 release (#1903) 
* Fix tests for 1.16.6 release
 2019-07-08 11:09:24 +02:00
Luka Murn 79823a9d60 Bump VERSION to 1.16.6 2019-07-05 14:27:18 +02:00
Mojca Lorber 989c10872c Fixes visual bugs on protocols.io and home page 2019-07-04 18:22:51 +02:00
Jure Grabnar 6e1d4c205c Add tests for page_id for search service 2019-07-04 16:02:29 +02:00
aignatov-bio 88dc2dcdd0
Hot fix for TinyMCE asset permission check (#1896) 
* Hot fix for TimyMCE asset permission check
 2019-07-04 15:59:11 +02:00
Jure Grabnar 9f42f6f24b Fix normalizer tests caused by pagination 2019-07-04 15:45:09 +02:00
Jure Grabnar 0eb09407bc Always scroll to top when searching for new string 2019-07-04 15:38:15 +02:00
Jure Grabnar dc7fee51fa Add Show more protocols functionality to external protocols 
Closes SCI-3646
 2019-07-04 15:35:18 +02:00
Jure Grabnar 4c3df5a67d Change tabs to spaces 2019-07-04 09:43:05 +02:00
Jure Grabnar 20134c9f8a
Features/protocolsio integration (#1893) 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Jure Grabnar 721bb9ab77
SCI-3649 All reagent data from step are not imported (#1881) 
SCI-3649 All reagent data from step are not imported
 2019-07-03 16:54:25 +02:00
Jure Grabnar 6944045bfb Check for empty description before passing to Nokogiri 
Closes SCI-3655
 2019-07-03 16:36:26 +02:00
Jure Grabnar 8866d98512 Fix empty file name on protocols.io 
Closes SCI-3650
 2019-07-03 16:11:51 +02:00
aignatov-bio 09dacf3be2
Fix infinite update for image annotation (#1889) 2019-07-03 15:35:49 +02:00
aignatov-bio d147e8260d
Fix issue with moving protocol in repository (#1887) 2019-07-03 15:35:37 +02:00
Oleksii Kriuchykhin e16cb513e1 Fix project page view saving [SCI-3654] 2019-07-03 15:34:16 +02:00
Miha Mencin 5a437c0a0f coding style fixes 2019-07-03 15:32:55 +02:00
Miha Mencin 964e91e1d2 removi mol weight from general section 2019-07-03 15:16:47 +02:00
Jure Grabnar e965866d57
SCI-3648 Error at importing one protocol without steps (#1883) 
SCI-3648 Error at importing one protocol without steps
 2019-07-03 14:43:49 +02:00
Miha Mencin 669592f62c
Merge pull request #1886 from biosistemika/SCI-3640-fix-safari-search-bar 
SCI-3640 Search line on Safari external protocols page needs update
 2019-07-03 14:18:02 +02:00
Miha Mencin 012b828708 additional filters for blank string when displaying the reagent details 2019-07-03 14:13:55 +02:00
Alex Kriuchykhin ec72b125cd
Merge pull request #1890 from okriuchykhin/ok_SCI_3651 
Fix webpacker build for production [SCI-3651]
 2019-07-03 14:12:44 +02:00
Oleksii Kriuchykhin d2aad22bbb Fix webpacker build for production [SCI-3651] 2019-07-03 14:08:44 +02:00
Miha Mencin 1b31f7f30a SCI-3640 set max width of search bar to 50% 2019-07-03 13:16:07 +02:00