Commit graph

4648 commits

Author SHA1 Message Date
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
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 (#1896)
* 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
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
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 #1880 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 #1882 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 (#1878) 2019-07-03 09:18:52 +02:00
aignatov-bio
65cf5e5787
Fix activities menu selector highlight (#1877) 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 (#1874) 2019-07-02 11:21:14 +02:00
aignatov-bio
378e91b426
Fix links on search page (#1867) 2019-07-02 11:21:00 +02:00
aignatov-bio
68ebf13bca
Fix tags modal issue (#1856) 2019-07-02 11:20:49 +02:00
Alex Kriuchykhin
7e4852d5aa
Merge pull request #1871 from okriuchykhin/ok_SCI_3511_v2
Fix TinyMCE editor initialization for step editing [SCI-3511]
2019-07-01 16:08:36 +02:00
Mojca Lorber
41935a9471 Remove unassign_user_from_project notification and change code to use helper method for assignment notification generation 2019-07-01 13:44:27 +02:00
aignatov-bio
2793777463
Features/docx report (#1873)
* Initial setup for docx report

* Add render for project, experiment, my_module

* Implement converter for RTE fields

* Add all report elements

* fix markup

* Change headers, remove empty blocks, refactored repository draw

* Add smart annotations support

* Fix justify fields

* Prepare for addons integration

* Fix markup

* Add comments to GemFile

* Fix TinyMCE error

* Change UI for new report download selector

* Fix file error in inventory cell for docx

* Fix i18n object for header
2019-07-01 10:14:16 +02:00
Oleksii Kriuchykhin
2f39b7f22b Fix TinyMCE editor initialization for step editing [SCI-3511] 2019-06-28 12:06:04 +02:00
Jure Grabnar
ebbb36cc6d Remove border from the import button 2019-06-28 11:32:47 +02:00
Jure Grabnar
8146a6a42c Assign name = position if protocolsIO step has no name 2019-06-28 11:29:03 +02:00
Jure Grabnar
5430fb311d Hound fixes 2019-06-28 10:41:20 +02:00
Jure Grabnar
c10428cd2a Fix sorting buttons not applying params 2019-06-28 08:55:27 +02:00
Jure Grabnar
1a9fca87d2 Fix non-existent protocol-card in preview banner 2019-06-28 08:49:12 +02:00
Jure Grabnar
149f45f4fc Hound fixes 2019-06-28 02:31:25 +02:00
Jure Grabnar
bc4b07cc0f Refactor hardcoded protocol_source in SearchService 2019-06-28 02:26:31 +02:00
Jure Grabnar
9be4fc2470 Fix tests 2019-06-28 02:19:06 +02:00
Jure Grabnar
7fb696cf48 Fix unclickable import modal 2019-06-28 02:00:05 +02:00
Jure Grabnar
03b81400a9 Add timeout to search 2019-06-28 01:50:52 +02:00
Jure Grabnar
1ccabf62b3 Add preview banner in external protocols 2019-06-28 01:38:33 +02:00
Jure Grabnar
81695665c7 Add hover effect on the card 2019-06-28 00:47:08 +02:00
Jure Grabnar
d3afcbed50 Style card view on external protocols
Closes SCI-3535
2019-06-28 00:43:05 +02:00
Jure Grabnar
7fb650a125 Change click -> onchange event for sort_by buttons 2019-06-27 22:56:38 +02:00
Jure Grabnar
0a77cedaf8 Fix sorting of external protocols and start showing results 2019-06-27 22:48:56 +02:00
Jure Grabnar
8338892fc6 Update external protocols form to include sort_by 2019-06-27 21:26:28 +02:00
Urban Rotnik
9cb4454537 New implementation for attachments creation 2019-06-27 17:02:06 +02:00
Urban Rotnik
1fd0ca6795 Add steps preview 2019-06-27 16:46:02 +02:00
Urban Rotnik
2761079479 Add modal for import 2019-06-27 16:46:02 +02:00
Jure Grabnar
82fb8ebd2e
Implement protocols.io error handling (#1869)
Implement protocols.io error handling
2019-06-27 16:35:55 +02:00
Jure Grabnar
06b8d1fda7 Update ApiClient tests
Closes SCI-3434
2019-06-27 14:54:19 +02:00
Jure Grabnar
8a7a2eb097 Add StandardError checking for ProtocolNormalizer 2019-06-27 10:12:00 +02:00
Jure Grabnar
d31f978e55 DRY up protocols importer services errors 2019-06-27 10:11:36 +02:00
Jure Grabnar
86bc69e510 Simplify V3 errors structure 2019-06-27 09:42:21 +02:00
Jure Grabnar
7d71608166 Add spinner to external preview 2019-06-26 19:43:35 +02:00
Mojca Lorber
9fd83d54a0 Put network error handeling into api and refactor errors 2019-06-26 14:04:03 +02:00
aignatov-bio
83bc9eb22f
Merge pull request #1839 from aignatov-bio/ai-sci-3369-activity-for-edited-image-annotation
Adding new activities for image editing [SCI-3369]
2019-06-24 10:31:39 +02:00
aignatov-bio
57e0478b81
Merge pull request #1855 from aignatov-bio/ai-sci-3583-fix-table-header-in-report
Fix handsontable [SCI-3583]
2019-06-24 09:39:35 +02:00
aignatov-bio
81c76fb112
Merge pull request #1854 from aignatov-bio/ai-sci-3586-comment-counter-not-updated
Fix comments counter for zero comments [SCI-3586]
2019-06-24 09:39:22 +02:00
aignatov-bio
8ec6802b19
Merge pull request #1853 from aignatov-bio/ai-sci-3581-too-long-protocol-name-in-task
Trunc long protocol name on task page [SCI-3581]
2019-06-24 09:39:07 +02:00
Anton Ignatov
76e09a2a3d Clear TinyMce autosave after manual save 2019-06-21 14:21:03 +02:00
Anton Ignatov
dfece85ea1 Fix handsone table 2019-06-21 11:16:44 +02:00
Anton Ignatov
57ef9573f2 Fix comments counter for zero comments 2019-06-21 10:43:41 +02:00
Anton Ignatov
bc98cac9cc Trunc long protocol name on task page 2019-06-20 15:28:15 +02:00
Alex Kriuchykhin
db7c6435b3
Merge pull request #1851 from okriuchykhin/ok_SCI_3436
Implement saving of attachments ordering on steps [SCI-3436]
2019-06-20 11:31:15 +02:00
Anton Ignatov
df344f4d03 Merge branch 'master' into ai-sci-3369-activity-for-edited-image-annotation 2019-06-20 09:43:53 +02:00
Anton Ignatov
3069ec8dd2 Add check for edit permission 2019-06-20 09:43:23 +02:00
Jure Grabnar
b2b752fcf8 Fix hound complaints 2019-06-19 23:37:04 +02:00
Jure Grabnar
fcd42a4178 Fix border radius around active sort button 2019-06-19 22:59:30 +02:00
Jure Grabnar
b3c3b68dc2 Add external preview to External Protocols tab
Closes SCI-3563
2019-06-19 22:54:20 +02:00
Anton Ignatov
a843a016a0 Fix markup and naming 2019-06-19 15:19:47 +02:00
Oleksii Kriuchykhin
f2b617ac12 Fix code formatting [SCI-3436] 2019-06-19 14:23:12 +02:00
Oleksii Kriuchykhin
ae1a63037b Raise an exception if required methods for ViewableModel are not implemented [SCI-3436] 2019-06-19 14:17:17 +02:00
Anton Ignatov
dae5a661c9 Merge branch 'master' of https://github.com/biosistemika/scinote-web 2019-06-19 14:11:51 +02:00
aignatov-bio
83b9efd7dd Fix right floating images in RTE editor (#1842) 2019-06-19 14:06:33 +02:00
aignatov-bio
609c408c77 Fix error on new step saving command (#1845) 2019-06-19 14:06:25 +02:00