Anton Ignatov
|
8b11cec953
|
Fix wording in en
|
2019-05-14 09:52:41 +02:00 |
|
aignatov-bio
|
fe2a3c4ee6
|
Add message when turbolinks change page with dirty tinyMCE [SCI-3452] (#1754)
* Add message when turbolinks change page with dirty tinuMCE
|
2019-05-14 09:49:00 +02:00 |
|
aignatov-bio
|
f970eea525
|
Some gui fixes (#1757)
|
2019-05-14 09:43:02 +02:00 |
|
Alex Kriuchykhin
|
e544edeaf7
|
Merge pull request #1758 from okriuchykhin/ok_SCI_3381
Fix handling of processing step attachments [SCI-3381]
|
2019-05-14 09:26:30 +02:00 |
|
Oleksii Kriuchykhin
|
4b1c4bd140
|
Fix handling of proccessing step attachments [SCI-3381]
|
2019-05-13 17:12:06 +02:00 |
|
Luka Murn
|
40ab883369
|
Merge pull request #1756 from Ducz0r/lm-sci-3426-fix-2
Refactor WOPI filename length validation onto the model [SCI-3426]
|
2019-05-13 16:12:55 +02:00 |
|
Miha Mencin
|
367ecba488
|
Merge pull request #1755 from mlorb/ml-sci-3349
Change author of copied inventory item [SCI-3349]
|
2019-05-13 15:54:38 +02:00 |
|
Luka Murn
|
bd9ffe4bd2
|
Refactor WOPI filename length validation onto the model
|
2019-05-13 15:41:39 +02:00 |
|
Mojca Lorber
|
5c847d5b5d
|
Change author of copied inventory item
|
2019-05-13 15:37:36 +02:00 |
|
Anton Ignatov
|
652fba0e23
|
Merge branch 'master-with-note-section'
|
2019-05-13 11:08:11 +02:00 |
|
aignatov-bio
|
039b2f3754
|
Fix zoom on Y axis [SCI-3374] (#1750)
* Add zoom to image annotation
|
2019-05-13 11:01:39 +02:00 |
|
Miha Mencin
|
765c6ebd6a
|
Merge pull request #1747 from biosistemika/lm-sci-3438-fix
Fix TinyMCE images in task description and task protocol description view [SCI-3438]
|
2019-05-13 10:56:30 +02:00 |
|
Miha Mencin
|
5ff344c208
|
Merge pull request #1746 from biosistemika/lm-sci-3426
Changes to create new office file button [SCI-3426]
|
2019-05-13 10:55:58 +02:00 |
|
aignatov-bio
|
d3aa6371cd
|
Fix report saving [SCI-3443] (#1753)
* Fix report saving
* Fix the report saving by using the reports' structures
* Remove uneccesary yarn.lock (mistake)
|
2019-05-13 10:55:08 +02:00 |
|
aignatov-bio
|
da5b24ef57
|
Fix attachment appearence after update (#1745)
|
2019-05-13 10:54:16 +02:00 |
|
Alex Kriuchykhin
|
837e5d1fea
|
Merge pull request #1744 from okriuchykhin/ok_SCI_3439
Change implementation of TinyMCE floating toolbar [SCI-3439]
|
2019-05-13 10:46:23 +02:00 |
|
aignatov-bio
|
71b3228310
|
Update protocol preview style [SCI-3416] (#1729)
* Update protocol appearance
|
2019-05-13 10:45:12 +02:00 |
|
Alex Kriuchykhin
|
6e088ebf3b
|
Merge pull request #1724 from okriuchykhin/ok_SCI_3402
Switch from package-lock.json to yarn.lock [SCI-3402]
|
2019-05-13 10:29:33 +02:00 |
|
Oleksii Kriuchykhin
|
b60bd79e2b
|
Change implementation of TinyMCE floating toolbar [SCI-3439]
|
2019-05-13 10:26:15 +02:00 |
|
aignatov-bio
|
3633274c8f
|
Fix import for eln (#1741)
|
2019-05-13 10:22:30 +02:00 |
|
aignatov-bio
|
364f903b3c
|
Fix protocol preview name (#1749)
|
2019-05-13 10:17:47 +02:00 |
|
aignatov-bio
|
2010b3ad8f
|
Fix step comments bugs (#1751)
|
2019-05-13 09:49:53 +02:00 |
|
aignatov-bio
|
0b194eb3b1
|
Revert "Fix report saving (#1748)" (#1752)
This reverts commit 3db6129808.
|
2019-05-13 09:09:36 +02:00 |
|
aignatov-bio
|
3db6129808
|
Fix report saving (#1748)
|
2019-05-13 08:58:47 +02:00 |
|
aignatov-bio
|
634b58bd6a
|
Various UX improvements for note section [SCI-3444] (#1742)
* Various UX improvments for note section
|
2019-05-11 16:04:28 +02:00 |
|
Luka Murn
|
059ebf6f27
|
Fix task and protocol description (TinyMCE) rendering on task page
Closes SCI-3438.
|
2019-05-10 20:39:26 +02:00 |
|
Luka Murn
|
bbfad0efe5
|
Refresh current page after new OfficeOnline file is created
|
2019-05-10 18:30:48 +02:00 |
|
Luka Murn
|
890df8803e
|
Add file name validation to create new Office file modal window
|
2019-05-10 18:19:32 +02:00 |
|
Luka Murn
|
584cf4b93b
|
Change Office icon on the create New Office buttons
|
2019-05-10 17:51:29 +02:00 |
|
mlorb
|
110c4ec460
|
Merge pull request #1743 from mlorb/ml-sci-3386
Fix tiny mce visuals, saving and cursor position [SCI-3386]
|
2019-05-10 17:45:12 +02:00 |
|
Luka Murn
|
5135922254
|
Move the WOPI controls partial to /wopi folder, fix typo
|
2019-05-10 16:51:54 +02:00 |
|
Luka Murn
|
b78caef915
|
Fix the file preview modal so it supports WOPI_ENABLED == false
|
2019-05-10 16:41:11 +02:00 |
|
aignatov-bio
|
f684ddd365
|
Change dropdown highlight color and fix task tag position [SCI-3410] (#1735)
* Change dropdown highlight color and fix task tag position
|
2019-05-10 16:37:59 +02:00 |
|
Mojca Lorber
|
86255b9037
|
Remove automatic saving on task and protocol description
|
2019-05-10 15:30:29 +02:00 |
|
aignatov-bio
|
bbf54de9c7
|
Merge pull request #1736 from aignatov-bio/ai-sci-3423-add-old-tinymce-support
Add old tinymce image support [SCI-3423]
|
2019-05-10 15:27:42 +02:00 |
|
Mojca Lorber
|
d761a5cecb
|
Make tiny mce saving at clicking anywhere outside of the editor works only for task and protocol description
|
2019-05-10 11:27:47 +02:00 |
|
Mojca Lorber
|
8e6413b031
|
Fix tiny mce visuals, saving and cursor position
|
2019-05-10 10:52:14 +02:00 |
|
aignatov-bio
|
3bb268459f
|
Merge pull request #1739 from aignatov-bio/ai-sci-3425-add-smart-annotation-to-protocol-description
Fix smart annotation in protocols in repository [SCI-3425]
|
2019-05-09 15:36:42 +02:00 |
|
Alex Kriuchykhin
|
2a7f70929a
|
Merge pull request #1717 from okriuchykhin/ok_SCI_3368
Improve clean up of Export All files [SCI-3368]
|
2019-05-09 13:37:56 +02:00 |
|
Alex Kriuchykhin
|
1414085656
|
Merge pull request #1740 from okriuchykhin/ok_SCI_3403
Improve HTML data escaping in JSON endpoints [SCI-3403]
|
2019-05-09 13:37:17 +02:00 |
|
Anton Ignatov
|
2e6bab4638
|
Fix smart anottation to protocols in repository
|
2019-05-09 09:40:40 +02:00 |
|
aignatov-bio
|
531badf9ec
|
Merge pull request #1738 from aignatov-bio/ai-sci-3424-fix-uploading-portocol-from-repo
Fix protocol update error, rollback bootstrap gems and fix step name [SCI-3424][SCI-3427]
|
2019-05-08 17:40:24 +02:00 |
|
Oleksii Kriuchykhin
|
40550f92c9
|
Improve HTML data escaping in JSON endpoints [SCI-3403]
|
2019-05-08 17:38:24 +02:00 |
|
Anton Ignatov
|
995408e7fc
|
Fix protocol update error, rollback bootstrap gems and fix step name
|
2019-05-08 17:18:19 +02:00 |
|
Anton Ignatov
|
bee87f51ba
|
Fix tests
|
2019-05-08 15:22:06 +02:00 |
|
Anton Ignatov
|
5a5101410c
|
Fix markup
|
2019-05-08 14:35:28 +02:00 |
|
Anton Ignatov
|
b2063d3018
|
Fix markup
|
2019-05-08 14:30:33 +02:00 |
|
Anton Ignatov
|
f201c5440b
|
Add check for old tinymce for report and reassign process
|
2019-05-08 14:29:25 +02:00 |
|
Anton Ignatov
|
5d959f648e
|
Convert old tinymce assets to new on fly
|
2019-05-08 14:23:26 +02:00 |
|
aignatov-bio
|
d08bdd771e
|
Fix task tag cut off (#1734)
|
2019-05-08 10:21:59 +02:00 |
|