Commit graph

4857 commits

Author SHA1 Message Date
aignatov-bio
4bae87e3f7
Styling changes in DOCX report [SCI-3633] (#1899)
* 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 (#1923) 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 (#1927) 2019-07-12 11:17:51 +02:00
aignatov-bio
d8d04b89cd
Fix autosave issue in mozzila (#1925) 2019-07-12 11:15:45 +02:00
aignatov-bio
26ef970a1e
Add academy button (#1924) 2019-07-12 11:15:34 +02:00
aignatov-bio
70589126c3
Fix autosave for steps (#1926) 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 (#1916) 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] (#1914)
* 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 #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
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
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… (#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
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 (#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
Oleksii Kriuchykhin
c0c8e0e1a3 Refactor Experiment workflow images [SCI-3539] 2019-07-04 09:33:12 +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
Oleksii Kriuchykhin
4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +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
Anton Ignatov
1f40fa69fc Merge branch 'features/marvinjs-integration' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-07-01 11:51:27 +02:00
aignatov-bio
a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Anton Ignatov
c9ae9f056e Merge branch 'okriuchykhin-ok_SCI_3539' into features/marvinjs-integration 2019-07-01 10:44:29 +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
Anton Ignatov
390002f40f Merge branch 'ok_SCI_3539' of https://github.com/okriuchykhin/scinote-web into okriuchykhin-ok_SCI_3539 2019-07-01 10:12:26 +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
Anton Ignatov
6be227b2d3 Merge branch 'master' of https://github.com/biosistemika/scinote-web into features/marvinjs-integration 2019-06-28 10:47:38 +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
Oleksii Kriuchykhin
5acb16d43e Update Asset helper methods [SCI-3539] 2019-06-28 08:17:09 +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
Oleksii Kriuchykhin
ba2daede0b Add migration scripts [SCI-3539] 2019-06-24 15:17:42 +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
ab73987245 improve connector perfomance 2019-06-23 00:48:50 +02:00
Anton Ignatov
31c6802a06 Add support for marvinjs on service 2019-06-23 00:09:49 +02:00
Anton Ignatov
8240c8baad Initial refactoring for remote api support 2019-06-22 01:51:59 +02:00
Anton Ignatov
7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +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
aignatov-bio
5734d0cdd7 Fix TinyMCE field selector for steps (#1844) 2019-06-19 14:06:16 +02:00
aignatov-bio
4ddcbe5d75 Fix user permission for recent protocols (#1843) 2019-06-19 14:06:02 +02:00
aignatov-bio
9653f16196
Convert image to base64 in PDF reports [SCI-3557] (#1835)
* Convert image to base64 in PDF reports

* Fix typo error
2019-06-19 13:57:04 +02:00
aignatov-bio
81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
Urban Rotnik
bf6041e13d Update sanitization of html descriptions 2019-06-19 11:05:22 +02:00
Urban Rotnik
7e69375016 Drop header column and row when extract tables 2019-06-19 10:47:38 +02:00
Urban Rotnik
2a579f2240 Add Warnings, Before start and Guidelinese to protocol description 2019-06-19 09:02:42 +02:00
Mojca Lorber
ebcaa4b014 Implement protocols.io error handling for api client and normalizer 2019-06-18 14:01:57 +02:00
Urban Rotnik
c691ad80b5 Add fields to query params for ApiClient 2019-06-17 12:24:16 +02:00
Urban Rotnik
88d96c0938 Use service in controller 2019-06-17 12:24:15 +02:00
Urban Rotnik
7fad5fc594 Add search service and normalizer for list 2019-06-17 12:24:15 +02:00
Jure Grabnar
4f6397b5b9 Add form to external_sources#new action
Closes SCI-3532
2019-06-17 12:24:15 +02:00
Jure Grabnar
c8b8bcffdb Add external_protocols#show action 2019-06-17 12:24:14 +02:00
Jure Grabnar
f7c6f78925 Add external_protocols#index action 2019-06-17 12:24:14 +02:00
Jure Grabnar
2a61075156 Add ExternalProtocols#create action and tests 2019-06-17 12:24:14 +02:00
Jure Grabnar
9baa66c998 Refactor OnlineSources -> ExternalProtocols 2019-06-17 12:24:13 +02:00
Jure Grabnar
eb0d677a36 Refactor pio_protocol -> built_protocol 2019-06-17 12:24:13 +02:00
Jure Grabnar
94e7fe1e6c OnlineSourcesController skeleton and #new action tested 2019-06-17 12:24:13 +02:00
Jure Grabnar
7adef9cc9e Change sort buttons positions
Closes SCI-3534
2019-06-17 12:24:13 +02:00
Jure Grabnar
218cf84775 Hound fixes 2019-06-17 12:24:12 +02:00
Jure Grabnar
d103f8ffec Finish external protocols screen
Closes SCI-3534
2019-06-17 12:24:12 +02:00
Jure Grabnar
0b60da9b4c Add ExternalProtocols skeleton tab 2019-06-17 12:24:12 +02:00
Urban Rotnik
0d43ecdfab Import protocol service after object is built 2019-06-17 12:24:11 +02:00
Jure Grabnar
eb275c4d12 Add tests for BuildProtocolService and fix bugs 2019-06-17 12:24:11 +02:00
Jure Grabnar
362b0cd45d Hound fixes 2019-06-17 12:24:11 +02:00
Jure Grabnar
640f6c1211 Fix tests after BuildProtocolFromClientService refactor
Closes SCI-3544
2019-06-17 12:24:11 +02:00
Jure Grabnar
1e8627c450 Refactor ImportProtocol service to BuildProtocolService
Closes SCI-3544
2019-06-17 12:24:10 +02:00
Urban Rotnik
a15596a126 Add ImportProtocolService 2019-06-17 12:24:10 +02:00
Urban Rotnik
2bb4f558b7 View rendering simplified, small improvements 2019-06-17 12:24:09 +02:00
Urban Rotnik
807104035c Add StepBuilder, TableBuilder, AssetBuilder for PIO, normalized updated 2019-06-17 12:24:09 +02:00
Urban Rotnik
6a4deb0201 Add ProtocolIntermediateObject 2019-06-17 12:24:09 +02:00
Urban Rotnik
aadf2eecb4 Basic data normalizer for ProtocolIO 2019-06-17 12:24:08 +02:00
Urban Rotnik
ec49388283 Add protocol base normalizer class 2019-06-17 12:24:08 +02:00
Jure Grabnar
c1cee07a63 Extract API client constants to constants.rb 2019-06-17 12:24:08 +02:00
Jure Grabnar
a15b1f6dfa Add logging for ApiClient and fix hound formatting 2019-06-17 12:24:08 +02:00
Jure Grabnar
5685709f48 Implement API client for protocols.io
Closes SCI-3357
2019-06-17 12:24:07 +02:00
aignatov-bio
fb3b7918af
Fix handson table issue (#1827) 2019-06-14 16:21:27 +02:00
aignatov-bio
2dfbdacfa3
Change restore button background (#1829) 2019-06-14 16:21:01 +02:00
aignatov-bio
da8d748c49
Fix small comments bugs (#1832) 2019-06-14 16:20:47 +02:00
aignatov-bio
68937dd192
Fix RTE import for protocol repository (#1833) 2019-06-14 16:20:27 +02:00
aignatov-bio
7a3eedf461
Adding missing avatars to comments (#1838) 2019-06-14 16:20:13 +02:00
Anton Ignatov
f480c0eb8d Adding new activtiies for image editing 2019-06-14 16:15:30 +02:00
aignatov-bio
52a2f5cd0e
Add recent protocols dropdown to task page [SCI-3417] (#1800)
* Add recent protocols dropdown to task page
2019-06-13 15:47:29 +02:00
Oleksii Kriuchykhin
097639e71e Fix view state validation [SCI-3436] 2019-06-13 14:28:46 +02:00
Alex Kriuchykhin
599274eb13
Merge pull request #1830 from okriuchykhin/ok_SCI_3528
Make repositories more extendable [SCI-3528]
2019-06-13 09:45:18 +02:00
Alex Kriuchykhin
bc94771828
Merge pull request #1791 from okriuchykhin/ok_SCI_3461
Refactor the async thumbnail reloading (spinner) [SCI-3461]
2019-06-12 15:35:15 +02:00
Alex Kriuchykhin
4f851b0995
Merge pull request #1816 from aignatov-bio/ai-sci-3525-fix-nil-error-in-module-tag-controller
Fix nil issue in tags_my_module controller [SCI-3525]
2019-06-12 13:11:40 +02:00
Oleksii Kriuchykhin
a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin
4d579db2e2 Refactor assets polling to use setTimeout [SCI-3461] 2019-06-11 13:14:07 +02:00
mlorb
fa28e772f0
Merge pull request #1807 from mlorb/ml-sci-3508
Fix some css on step panel heading [SCI-3508]
2019-06-11 11:12:12 +02:00
Oleksii Kriuchykhin
6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +02:00
Jure Grabnar
bbfe2b9c89
Merge pull request #1798 from biosistemika/jg_sci_3145_thumbnail_preview
File preview on new attachments layout [SCI-3145]
2019-06-10 17:59:12 +02:00
Jure Grabnar
56949db9da Move extract_image_quality to before_post_process 2019-06-10 17:48:00 +02:00
Jure Grabnar
c2d615ab48 Remove image quality preprocessor 2019-06-10 15:10:07 +02:00
Urban Rotnik
bbe0062bfd Small fixes for factories 2019-06-10 12:24:05 +02:00
Urban Rotnik
965b7eb58b Add missing factories 2019-06-10 12:24:04 +02:00
Urban Rotnik
f19eeba8dc Add factory valid check for User's associations 2019-06-10 12:24:04 +02:00
Urban Rotnik
ba340f7bee Add valid factory check for Table, Tag, Team 2019-06-10 12:24:03 +02:00
Urban Rotnik
9348886fb1 Minior changes in SystemNotifications tests 2019-06-10 12:24:03 +02:00
Urban Rotnik
15cbd8864c Add valid factory check to Steps models 2019-06-10 12:24:03 +02:00
Urban Rotnik
1e60102a7d Add valid factory check for Sample(s) models 2019-06-10 12:24:02 +02:00
Urban Rotnik
c66aa29227 Add valid factory check for Result(s) models 2019-06-10 12:24:02 +02:00
Urban Rotnik
3adf2bb736 Add factories and validation tests for repositories and related models
Repositories, cells, columns, values (date, text, asset, list), rows, items
2019-06-10 12:24:02 +02:00
Urban Rotnik
a7558d83be Add valid factory check for Project, MyModules, notification, protocol 2019-06-10 12:24:01 +02:00
Urban Rotnik
3348b81b14 Checklist, checklist_item, activity, experiment spec and factories updated 2019-06-10 12:24:01 +02:00
Urban Rotnik
6321c0f5c0 Assets spec and factories updated 2019-06-10 12:24:01 +02:00
Mojca Lorber
ca1b91a409 css fix again 2019-06-10 11:23:40 +02:00
Oleksii Kriuchykhin
8920d38a02 Make repositories more extendable [SCI-3528] 2019-06-06 17:28:59 +02:00
Oleksii Kriuchykhin
e543a849d4 Add document file preview generation with LibreOffice [SCI-3145] 2019-06-05 14:52:30 +02:00
aignatov-bio
d553fee2b3
Prevent negative scroll for sidebar (#1819) 2019-06-05 12:41:27 +02:00
Urban Rotnik
3d3c6d5350 Toolbar position fix for Safari 2019-06-04 15:55:44 +02:00
Alex Kriuchykhin
db399864f8
Merge pull request #1820 from okriuchykhin/ok_SCI_3526
Update Handsontable to 6.2.2 [SCI-3526]
2019-06-04 14:59:22 +02:00
Alex Kriuchykhin
36255f82ed
Merge pull request #1817 from okriuchykhin/ok_SCI_3522
Add system notifications service to health check endpoint [SCI-3522]
2019-06-04 14:41:43 +02:00
aignatov-bio
d207cf5dce
Refactored comments over SciNote [SCI-3505] (#1808)
* Preparing helpers for comments

* Refactored comments over scinote

* Update events
2019-06-04 14:40:21 +02:00
Oleksii Kriuchykhin
01a5a17bb4 Update Handsontable to 6.2.2 [SCI-3526] 2019-06-04 14:31:37 +02:00
Anton Ignatov
d0439f478d Fix markup 2019-06-03 09:52:04 +02:00
Anton Ignatov
559bb2d793 Prevent selecting empty tag 2019-06-03 09:50:55 +02:00
Luka Murn
cedb10f83e
Merge pull request #1815 from Ducz0r/lm-sci-2991
Rename permision_eval - permission_eval [SCI-2991]
2019-06-03 09:24:20 +02:00
Anton Ignatov
5df55d39be Fix nil issue in module controller 2019-05-31 16:02:21 +02:00
Oleksii Kriuchykhin
552f69b9b1 Add system notifications service to health check endpoint [SCI-3522] 2019-05-31 15:52:47 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
Anton Ignatov
16d00340cd Fix merge errors 2019-05-31 10:35:04 +02:00
Anton Ignatov
c9a29b12ba Merge branch 'master' into features/marvinjs-integration 2019-05-31 10:27:14 +02:00
Luka Murn
b21bdddf15 Rename permision_eval - permission_eval
Hopefully this will help with getting rid of all the errors
that we've been receiving for PermissionEval.

Closes SCI-2991.
2019-05-31 09:56:54 +02:00
aignatov-bio
94b220172d
Fix empty result name issue (#1812) 2019-05-31 09:48:58 +02:00
aignatov-bio
3681df7b9f
Fix scroll issue in repository column editor (#1813) 2019-05-31 09:48:45 +02:00
Alex Kriuchykhin
27ccf7b8fe
Merge pull request #1803 from okriuchykhin/ok_SCI_3412
Add additional checks for inventory state objects [SCI-3412]
2019-05-30 16:09:13 +02:00
Alex Kriuchykhin
75f122aa15
Merge pull request #1809 from okriuchykhin/ok_SCI_3506
Fix import of ELN protocols [SCI-3506]
2019-05-30 16:08:27 +02:00
mlorb
111c062981
Merge pull request #1802 from mlorb/ml-sci-3470
Hide create office file button to user without permission [SCI-3470]
2019-05-30 14:27:19 +02:00
Alex Kriuchykhin
c49dbe5c44
Merge pull request #1810 from okriuchykhin/ok_SCI_3511
Fix RTE editor initialization for new step in protocol [SCI-3511]
2019-05-30 12:54:36 +02:00
Oleksii Kriuchykhin
d061aec5cd Fix RTE editor initialization for new step in protocol [SCI-3511] 2019-05-29 18:33:20 +02:00
Oleksii Kriuchykhin
6917ea56e8 Fix import of ELN protocols [SCI-3506] 2019-05-29 15:41:54 +02:00
Mojca Lorber
ca4d8e71bb fix some css on step panel heading 2019-05-29 13:56:55 +02:00
Oleksii Kriuchykhin
2c9ced0c75 Fix step numbering update on reposition [SCI-3507] 2019-05-29 12:20:35 +02:00
Oleksii Kriuchykhin
5a9640c5d1 Add aditional checks for inventory state objects [SCI-3412] 2019-05-27 17:32:21 +02:00
aignatov-bio
0b3b6d593b
Small style fixes [SCI-3498] (#1799)
* Adding error, if TinyMCE asset not in text, when we copy anything

* Small style fixes
2019-05-27 16:27:27 +02:00
Mojca Lorber
a3c29738bb Hide create office file button to user without permission 2019-05-27 14:58:10 +02:00
Luka Murn
d7fe23c6ce
Merge pull request #1796 from Ducz0r/lm-sci-3494
Fix the user.activities association so it works [SCI-3494]
2019-05-24 14:21:42 +02:00
Luka Murn
3a2bf2ce8a
Merge pull request #1780 from Ducz0r/lm-perform-wopi-checks-on-startup
Add a startup check for WOPI_ENABLED == true variables
2019-05-22 16:56:55 +02:00
aignatov-bio
0f86ebf173
Adding error, if TinyMCE asset not in text, when we copy anything [SCI-3495] (#1797)
* Adding error, if TinyMCE asset not in text, when we copy anything
2019-05-22 16:13:40 +02:00
Luka Murn
8b116d9de7 Fix the user.activities association so it works
Closes SCI-3494.
2019-05-22 15:42:50 +02:00
aignatov-bio
8f2d873130
Fix error when editing office document (#1793) 2019-05-22 10:34:16 +02:00
aignatov-bio
fb30e6b6e5
Add check for refreshProtocolStatusBar function exist (#1794) 2019-05-22 10:31:29 +02:00
aignatov-bio
da33a053cf
Fix avatar image position on global activities (#1792) 2019-05-22 10:21:18 +02:00
Oleksii Kriuchykhin
84a2ad4487 Refactor the async thumbnail reloading (spinner) [SCI-3461] 2019-05-21 17:29:33 +02:00
aignatov-bio
2cee46a10d
Fix experiment name length (#1789) 2019-05-21 15:54:01 +02:00
aignatov-bio
d97e803d01
Adding placeholder to TinyMCE editor (#1788) 2019-05-21 15:53:47 +02:00
aignatov-bio
59e824ef9e
Fix nil handling in different places [SCI-2840] (#1777)
* Fix nil handling in different places
2019-05-21 15:53:34 +02:00
mlorb
be0393e642
Merge pull request #1785 from biosistemika/lm-ml-sci-3193
Update protocol status bar upon protocol changing [SCI-3193]
2019-05-21 15:28:58 +02:00
aignatov-bio
2de2ead723
Refactor avatar image appearance across Scinote [SCI-3482] (#1787)
* Refactor avatar appearance across Scinote
2019-05-21 15:19:44 +02:00
Alex Kriuchykhin
64c31a6418
Merge pull request #1786 from okriuchykhin/ok_SCI_3368_v2
Add type column to zip_exports for STI [SCI-3368]
2019-05-21 11:04:51 +02:00
aignatov-bio
5081546c78
Fix padding for protocol description (#1782) 2019-05-21 10:21:30 +02:00
Oleksii Kriuchykhin
d3f29d5d72 Add type column to zip_exports for STI [SCI-3368] 2019-05-20 16:35:24 +02:00
Mojca Lorber
b479a6a145 Cover all use cases for updating protocol status bar 2019-05-20 16:09:43 +02:00