scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-15 01:13:43 +08:00
Code Issues Projects Releases Packages Wiki Activity
6072 commits 55 branches 189 tags 169 MiB
Commit graph

4732 commits

Author SHA1 Message Date
Anton Ignatov
d79fec3345 Move TinyMCE logic to correspond controller 2019-07-16 15:51:44 +02:00
Anton Ignatov
03a45d7dd8 Fix markup 2019-07-16 13:42:39 +02:00
Anton Ignatov
1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov
3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Miha Mencin
47d3315d82 SCI-3702 revert the fix and use local variables 2019-07-15 16:20:39 +02:00
Miha Mencin
1c84e46a21 Revert "SCI-3702 replace _to_text with _to_html" 
This reverts commit 93b7c472ac.
 2019-07-15 16:18:26 +02:00
Miha Mencin
93b7c472ac SCI-3702 replace _to_text with _to_html 2019-07-15 16:16:41 +02:00
aignatov-bio
a8623002e6
Small UI changes [SCI-3699] () 
* Small ui changes

* Markup fix

* Add class for addons
 2019-07-15 13:28:20 +02:00
aignatov-bio
3c32fe0895
Fix formulas in table report () 2019-07-15 13:27:27 +02:00
Urban Rotnik
795c355f01
Merge pull request from urbanrotnik/ur-sci-3531-tests-for-step-components 
Add tests for StepComponents [SCI-3531]
 2019-07-15 13:25:36 +02:00
Miha Mencin
8d3b94d7bc
Merge pull request from okriuchykhin/ok_SCI_3700 
Improve permissions checks for reports [SCI-3700]
 2019-07-15 12:34:59 +02:00
Jure Grabnar
eb615ea8dd
[SCI-3670] Show protocols at external protocols tab () 
[SCI-3670] Show protocols at external protocols tab
 2019-07-15 11:24:01 +02:00
aignatov-bio
894e201e1b
Fix big file issue in step attachments [SCI-3682] () 
* Fix big file issue in step atachments

* Fix markup
 2019-07-15 11:00:01 +02:00
Jure Grabnar
d210b0b152 Trigger loading of latest publications when page is loaded 
Closes SCI-3670
 2019-07-15 08:52:17 +02:00
Jure Grabnar
015dae1a05 Fix old tests 2019-07-15 08:27:34 +02:00
Jure Grabnar
a372d4056d Add last_published protocols.io endpoint 2019-07-14 19:24:53 +02:00
Alex Kriuchykhin
313d2d27b9
Update repository_rows_controller.rb 2019-07-12 17:03:09 +02:00
Urban Rotnik
5cf100a787 Show 'published_on' instead of 'created_on' on external_protocols list 2019-07-12 16:56:07 +02:00
Oleksii Kriuchykhin
1c235aafe5 Improve permissions checks for reports [SCI-3700] 2019-07-12 16:44:15 +02:00
mlorb
5bc8eb7392
Merge pull request from mlorb/ml-sci-3641 
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
 2019-07-12 15:52:40 +02:00
Anton Ignatov
ba1d6d45ca Fix merging issues 2019-07-12 15:47:15 +02:00
Anton Ignatov
ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +02:00
Anton Ignatov
7831b0a089 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 15:00:07 +02:00
Oleksii Kriuchykhin
6166a0dbb0 Fix file result update method [SCI-3695] 2019-07-12 14:42:04 +02:00
Mojca Lorber
d07e04e511 Fix dooble flash_alerts load 2019-07-12 14:33:41 +02:00
aignatov-bio
4bae87e3f7
Styling changes in DOCX report [SCI-3633] () 
* Styling changes in DOCX report

* Update result comments in docx report

* Fix markup
 2019-07-12 13:48:14 +02:00
aignatov-bio
5ca822a7d8
Add archive lables and fix bright colors in RTE fields () 2019-07-12 11:38:48 +02:00
Anton Ignatov
57a273d5d0 Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-12 11:34:41 +02:00
aignatov-bio
c6152ccddb
Fix big table issue in ProtocolIo preview () 2019-07-12 11:17:51 +02:00
aignatov-bio
d8d04b89cd
Fix autosave issue in mozzila () 2019-07-12 11:15:45 +02:00
aignatov-bio
26ef970a1e
Add academy button () 2019-07-12 11:15:34 +02:00
aignatov-bio
70589126c3
Fix autosave for steps () 2019-07-12 10:16:49 +02:00
Urban Rotnik
d5fbe5ecd7 Fix for safari on external protocols tab 2019-07-11 11:53:49 +02:00
Mojca Lorber
f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
aignatov-bio
ac7970209c
Add helper for inline JS code () 2019-07-11 09:31:30 +02:00
Jure Grabnar
5eb197127f Fix relative links in protocolsio iframe 
Closes SCI-3660
 2019-07-10 19:20:40 +02:00
Oleksii Kriuchykhin
64b7a5646a Implement custom document file previewer [SCI-3677] 2019-07-10 14:37:23 +02:00
aignatov-bio
7ac410e573
Fix visual bugs across ProtocolIo [SCI-3671] () 
* Fix visual bugs across ProtocolIo
 2019-07-10 13:00:32 +02:00
Urban Rotnik
b9bec32316 Add tests for StepComponents 2019-07-10 12:48:08 +02:00
Urban Rotnik
0ee2afae29
Merge pull request 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
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] () 
* Remove webinar button

* Remove constants and i18n
 2019-07-09 14:01:09 +02:00
aignatov-bio
fc78d8f401
Fix tooltip position () 2019-07-09 14:00:53 +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
Oleksii Kriuchykhin
a1941a21dc Futher refactoring of old Paperclip methods [SCI-3539] 2019-07-09 10:28:15 +02:00
Jure Grabnar
05f2210002
SCI-3650, SCI-3655 Fix empty file name, empty description when… () 
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 () 2019-07-09 09:35:43 +02:00
aignatov-bio
4fe3119bd2
Fix step description RTE images in report preview () 2019-07-08 15:23:44 +02:00
mlorb
7272d838b6
Merge pull request 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] () 
* 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 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 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 () 2019-07-08 12:55:35 +02:00
aignatov-bio
6d423ed986
Make Navbar icons bigger [SCI-3663] () 
* Make Navbar icons bigger
 2019-07-08 12:53:43 +02:00
aignatov-bio
2baca019eb
Remove tooltip from step edit button () 2019-07-08 12:52:03 +02:00
aignatov-bio
99b1075c28
Fix protcol naming when load multiple protocols () 2019-07-08 12:51:47 +02:00
aignatov-bio
0d1ec0d4ed
Fix I18n and constants in DOCX report () 2019-07-08 12:51:26 +02:00
Miha Mencin
ab9b7a7429
Merge pull request 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 from okriuchykhin/ok_SCI_3654 
Fix project page view saving [SCI-3654]
 2019-07-08 11:46:54 +02:00
Oleksii Kriuchykhin
9d926dc956 Refactor TinyMce assets, user avatars, zip files [SCI-3539] 2019-07-05 16:56:05 +02:00
Mojca Lorber
989c10872c Fixes visual bugs on protocols.io and home page 2019-07-04 18:22:51 +02:00
aignatov-bio
88dc2dcdd0
Hot fix for TinyMCE asset permission check () 
* Hot fix for TimyMCE asset permission check
 2019-07-04 15:59:11 +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
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +02:00
Jure Grabnar
20134c9f8a
Features/protocolsio integration () 
Features/protocolsio integration
 2019-07-03 17:32:20 +02:00
Jure Grabnar
721bb9ab77
SCI-3649 All reagent data from step are not imported () 
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 () 2019-07-03 15:35:49 +02:00
aignatov-bio
d147e8260d
Fix issue with moving protocol in repository () 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 () 
SCI-3648 Error at importing one protocol without steps
 2019-07-03 14:43:49 +02:00
Miha Mencin
669592f62c
Merge pull request 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
Miha Mencin
1b31f7f30a SCI-3640 set max width of search bar to 50% 2019-07-03 13:16:07 +02:00
Miha Mencin
882e453b9c
Merge pull request from biosistemika/SCI-3644-hide-import-button 
SCI-3644 Import button is always visible
 2019-07-03 11:50:10 +02:00
Oleksii Kriuchykhin
028e647f4d Upgrade to Rails 5.2.3 [SCI-3651] 2019-07-03 11:15:13 +02:00
Alex Kriuchykhin
48a9db4390
Merge pull request from jbargu/jg_sci_3590 
Update js-yaml by upgrading rails/webpacker [SCI-3590]
 2019-07-03 11:07:06 +02:00
Miha Mencin
37cc526ac9 fix CR comments 2019-07-03 10:22:59 +02:00
Jure Grabnar
4715e8ec4b Fix building of zero steps protocls 
Close SCI-3648
 2019-07-03 09:34:15 +02:00
Miha Mencin
611c417b43 code review changes 2019-07-03 09:21:41 +02:00
aignatov-bio
d2849c88fd
Remove draft after save step () 2019-07-03 09:18:52 +02:00
aignatov-bio
65cf5e5787
Fix activities menu selector highlight () 2019-07-03 09:18:41 +02:00
Miha Mencin
ab038ffdf7 SCI-3649 adding catalog number, fixing up the design a bit 2019-07-02 19:47:05 +02:00
Miha Mencin
74b4e0d774 SCI-3644 hide the import button and show it only on hover & when appropriate user 2019-07-02 18:24:07 +02:00
Jure Grabnar
fc961b570c Comment out index.jsx 
Closes SCI-3590
 2019-07-02 18:07:12 +02:00
Miha Mencin
4efb0b5a4a SCI-3645 added descending sorting by name 2019-07-02 17:42:55 +02:00
aignatov-bio
b1a74a893c
Remove strange symbol () 2019-07-02 11:21:14 +02:00
aignatov-bio
378e91b426
Fix links on search page () 2019-07-02 11:21:00 +02:00
aignatov-bio
68ebf13bca
Fix tags modal issue () 2019-07-02 11:20:49 +02:00
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00