scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-29 11:26:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
6397 commits 69 branches 179 tags 165 MiB
Commit graph

4969 commits

Author SHA1 Message Date
aignatov-bio 91cc054096
Merge pull request #2105 from aignatov-bio/ai-sci-fix-tests-for-import-repository-row 
Fix tests for repository row importer
 2019-09-30 16:47:17 +02:00
Anton Ignatov 99005cf22e Fix tests for repository row importer 2019-09-30 16:27:45 +02:00
Anton Ignatov 859c5931a4 Update MArvinJS asset on result text cancel 2019-09-30 16:09:43 +02:00
Jure Grabnar 9f704559ef Fix hound formatting issues 2019-09-30 14:42:15 +02:00
Jure Grabnar 096228abbb Shorten padding format in scss 2019-09-30 14:32:09 +02:00
Urban Rotnik 5812ebe4d5 Add permission check for button show 
SCI-3936
 2019-09-30 14:30:03 +02:00
Jure Grabnar 070c307721 Implement style changes suggested by Anton 2019-09-30 14:27:00 +02:00
Urban Rotnik 9397705033 Fix positions of CoSign and Unlock buttons 2019-09-30 13:39:23 +02:00
Urban Rotnik b13c429d26 SystemNotifications count position fixed 2019-09-30 13:12:35 +02:00
Urban Rotnik dfafd4767c Fix Protocol buttons group 
[SCI-3929]
 2019-09-30 11:51:37 +02:00
Jure Grabnar 8441c5b6ed Add anchor to result text editing 2019-09-30 11:34:39 +02:00
Jure Grabnar 477e41a96d Refactor I18n strings for tiny_mce 2019-09-30 11:34:39 +02:00
Jure Grabnar 289853e2e8 Do not remove draft on step cancel (temporary) 
Close SCI-3751
 2019-09-30 11:34:39 +02:00
Jure Grabnar b3cafcec7c Add restore draft notification to all models 
Close SCI-3751
 2019-09-30 11:34:39 +02:00
Jure Grabnar 0a36372321 Fix placeholder positioning 2019-09-30 11:34:39 +02:00
Jure Grabnar b286e4adfd Fix styles for notification bar 2019-09-30 11:34:39 +02:00
Jure Grabnar 4f2182e2f5 Remove restoredraft icon 2019-09-30 11:34:39 +02:00
Jure Grabnar 6e33baa995 Add skeleton restore-draft notification for module description 2019-09-30 11:32:38 +02:00
Jure Grabnar e24541ae51
Merge pull request #2087 from jbargu/jg_sci_3870 
[SCI-3870] Change/fix asset locking mechanism
 2019-09-30 08:48:39 +02:00
Jure Grabnar 0a3389f310 Fix operator for removing the lock on asset 2019-09-30 08:46:16 +02:00
mlorb 594124dad6
Merge pull request #2053 from mlorb/ml-sci-3637 
Redesign of sorting button for projects/experiments cards [SCI-3637]
 2019-09-27 12:44:44 +02:00
Alex Kriuchykhin 53caaf647b
Merge pull request #2080 from okriuchykhin/ok_SCI_3891 
Move file preview generation to delayed job [SCI-3891]
 2019-09-27 10:50:21 +02:00
Miha Mencin db36f379bb
Merge pull request #2097 from aignatov-bio/ai-sci-3930-fix-preview-for-result 
Fix preview for result [SCI-3930]
 2019-09-27 10:48:59 +02:00
Miha Mencin 0e75ea2e3e
Merge pull request #2096 from aignatov-bio/ai-sci-3932-fix-tiny-mce-render-in-report 
Fix tinymce assets render in report [SCI-3932]
 2019-09-27 10:48:10 +02:00
Miha Mencin 56b196f9b4
Merge pull request #2091 from aignatov-bio/ai-sci-3907-fix-cancel-button-for-tiny-mce 
Fix cancel button for marvinJS images [SCI-3907]
 2019-09-27 10:46:38 +02:00
mlorb 2fd9345616
Merge pull request #2068 from mlorb/ml-sci-3816 
Fix reloading of datatables header [SCI-3816]
 2019-09-27 10:29:32 +02:00
Jure Grabnar 0c24210f6a
[SCI-3784] Small RTF improvements (#2061) 
[SCI-3784] Small RTF improvements
 2019-09-27 10:27:57 +02:00
mlorb e3b0e149b6
Merge pull request #2077 from mlorb/ml-sci-3764 
Expand clickable area of links in secondary navigation [SCI-3764]
 2019-09-27 10:15:12 +02:00
mlorb 495d57b607
Merge pull request #2078 from mlorb/ml-sci-3906 
Fix bug with inventory navigation height [SCI-3906]
 2019-09-27 10:14:25 +02:00
mlorb 246634dbc4
Merge pull request #2069 from mlorb/ml-sci-3796 
Fix inventory item selection when previewing file [SCI-3796]
 2019-09-27 10:13:35 +02:00
Anton Ignatov 93363da4e5 Fix preview for result 2019-09-26 16:49:56 +02:00
Anton Ignatov 40a8c6a1cc Markup fix 2019-09-26 16:29:26 +02:00
Anton Ignatov 1f02fb4bc7 Fix tinymce assets render in report 2019-09-26 16:27:22 +02:00
Jure Grabnar 668f902570 Fix export all with active storage 
Close SCI-3924
 2019-09-26 16:01:30 +02:00
Anton Ignatov d048b7fb56 Fix cancel button for marvinJS images 2019-09-26 11:25:34 +02:00
aignatov-bio ba50b19986
Merge pull request #2082 from aignatov-bio/ai-sci-3907-fix-dirty-event-after-update-marvinjs-image 
Fix dirty event after update marvinjs image [SCI-3907]
 2019-09-25 13:51:36 +02:00
Anton Ignatov 305e9dc109 Fix error handling and rubocop error 2019-09-25 13:45:34 +02:00
Jure Grabnar 5cb900370a Change/fix asset locking mechanism 
Close SCI-3870
 2019-09-25 11:07:53 +02:00
aignatov-bio 429de4f115
Merge pull request #2083 from aignatov-bio/ai-sci-3904-fix-padding-for-marvinjs-promo-modal 
Fix padding for marvinjs modal [SCI-3904]
 2019-09-24 14:26:18 +02:00
aignatov-bio 856e876b61
Merge pull request #2079 from aignatov-bio/ai-sci-3900-fix-error-on-task-copy 
Fix error on task copy [SCI-3900]
 2019-09-24 14:16:38 +02:00
aignatov-bio 8a3b6b5cda
Merge pull request #2076 from aignatov-bio/ai-sci3769-fix-repository-row-import-export 
Fix repository row import/export [SCI-3769]
 2019-09-24 12:44:18 +02:00
Jure Grabnar ae83ef749f Add tables functionality in tinymce 
Close SCI-3821
 2019-09-24 12:44:00 +02:00
Anton Ignatov e01c438055 Fix padding for marvinjs modal 2019-09-24 11:02:15 +02:00
Anton Ignatov 6d81727bf1 Fix dirty event after update marvinjs image 2019-09-24 10:37:51 +02:00
Anton Ignatov c389972e2a Fix JS error in recent protocol drop down 2019-09-24 09:47:04 +02:00
Oleksii Kriuchykhin aabeeec95a Move file preview generation to delayed job [SCI-3891] 2019-09-23 21:07:03 +02:00
Anton Ignatov 646107a35b Fix error on task copy 2019-09-23 16:33:57 +02:00
Mojca Lorber a85c80d994 Fix bug with inventory navigation height 2019-09-23 16:12:41 +02:00
Mojca Lorber 9f30e05594 Expand clickable area of links in secondary navigation 2019-09-23 14:34:48 +02:00
Anton Ignatov 09e3b7c80b Fix repository row import/export 2019-09-23 13:33:02 +02:00
Jure Grabnar 8780e5183b Remove CSRF check in WopiController 2019-09-19 15:55:29 +02:00
Jure Grabnar cc561d8ee5 Change wopi_controller using Paperclip for reading 2019-09-19 15:03:13 +02:00
Alex Kriuchykhin 29ffe05442
Merge pull request #1964 from okriuchykhin/ok_SCI_3643 
Add text extraction from MarvinJS for search [SCI-3643]
 2019-09-18 16:22:11 +02:00
aignatov-bio d783391290
Merge pull request #2071 from aignatov-bio/ai-sci-3889-fix-error-on-archived-experiment-page 
Fix error on archived experiment page [SCI-3889]
 2019-09-18 15:35:53 +02:00
aignatov-bio 7951ae4218
Merge pull request #2070 from aignatov-bio/ai-sci-3874-error-handling-when-image-unavalialbe-for-base64 
Error handling, when image unavaliable for base64 [SCI-3874]
 2019-09-18 15:27:49 +02:00
Anton Ignatov 5a1efb84c6 Fix error on archived experiment page 2019-09-18 15:23:45 +02:00
Anton Ignatov 69eb8681bd Error handling, when image unavaliable for base64 2019-09-18 15:11:51 +02:00
Mojca Lorber 4263edf0cc Fix inventory item selection when previewing file 2019-09-18 15:08:40 +02:00
aignatov-bio fba030dc9d
Merge pull request #2067 from aignatov-bio/ai-sci-3880-fix-error-when-save-pdf-to-inventory 
Fix error when save report to inventory [SCI-3880]
 2019-09-18 14:59:47 +02:00
aignatov-bio c652bb0d44
Merge pull request #2066 from aignatov-bio/ai-sci-3878-fix-missing-expand-all-steps-button 
Fix missing expand all button [SCI-3878]
 2019-09-18 14:59:29 +02:00
aignatov-bio ce91759ee2
Merge pull request #2065 from aignatov-bio/ai-sci-3879-fix-step-table-error 
Fix step table error [SCI-3879]
 2019-09-18 14:59:16 +02:00
Mojca Lorber 4d4a275c0d Fix reloading of datatables header 2019-09-18 14:28:29 +02:00
Anton Ignatov b9f6b3a082 Fix error when save report to inventory 2019-09-18 12:50:54 +02:00
Anton Ignatov 0adb016293 Fix missing expand all button 2019-09-18 12:33:48 +02:00
Anton Ignatov 146c725e89 Fix step table error 2019-09-18 11:47:33 +02:00
aignatov-bio f205e4aa80
Merge pull request #2064 from aignatov-bio/ai-sci-3873-fix-file-preview-in-inventory 
Fix file preview in inventory [SCI-3873]
 2019-09-18 11:36:43 +02:00
aignatov-bio d028856fe0
Fix hidden buttons in inventory (#2063) 2019-09-18 11:36:30 +02:00
Anton Ignatov 68994a77c8 Fix file preview in inventory 2019-09-18 11:21:33 +02:00
aignatov-bio 11f6517d0a
Fix duplicate marvinjs save (#2057) 2019-09-18 11:18:44 +02:00
aignatov-bio 52499fa285
Fix pathe to icon for chemical structure (#2056) 2019-09-18 11:18:31 +02:00
Jure Grabnar 40aa1a37a2 Change colors of active buttons TinyMCE 
Close SCI-3784
 2019-09-17 15:45:27 +02:00
Oleksii Kriuchykhin e12cd0ae9d Fix autoloading issues [SCI-3881] 2019-09-17 10:50:01 +02:00
Mojca Lorber 47ccf38662 Redesign of sorting button for projects/experiments cards 2019-09-16 14:43:12 +02:00
Oleksii Kriuchykhin 3509543e7b Merge branch 'master' into ok_SCI_3881 2019-09-16 11:56:49 +02:00
Oleksii Kriuchykhin bc38c6b29e Fix failing test [SCI-3745] 2019-09-16 10:26:13 +02:00
Oleksii Kriuchykhin c068901b00 Upgrade Rails to 6.0 [SCI-3745] 2019-09-12 17:24:08 +02:00
Alex Kriuchykhin 0d6f011e61
Merge pull request #2006 from okriuchykhin/ok_SCI_3765 
Add path method to custom ActiveStorage S3 service [SCI-3765]
 2019-09-12 15:34:03 +02:00
aignatov-bio c4e8e8ed07
Revert "Fix formulas in project export (#2047)" (#2049) 
This reverts commit 36ae7d05f9.
 2019-09-12 10:45:43 +02:00
aignatov-bio a3b2c7d5fe
Fix report image issues [SCI-3772] (#1983) 
* Fix report image issues

* Small fixes
 2019-09-12 09:02:45 +02:00
aignatov-bio 36ae7d05f9
Fix formulas in project export (#2047) 2019-09-12 08:43:59 +02:00
aignatov-bio 07b9091e23
Fix html escape in unshared warning (#2048) 2019-09-11 16:33:31 +02:00
aignatov-bio 40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +02:00
aignatov-bio 27104a495c
Fix styling for unshared warning message (#2044) 2019-09-11 11:50:02 +02:00
mlorb cf8c98dfa3
Merge pull request #2042 from biosistemika/hotfix-september 
Hotfix september
 2019-09-10 13:53:28 +02:00
mlorb e596afa595
Merge pull request #2041 from mlorb/ml-sci-3847 
Fix missing icon on shared inventories in global search [SCI-3847]
 2019-09-10 13:51:58 +02:00
aignatov-bio 1f12a63a25
Fix counter on task inventory and failing test (#2043) 2019-09-10 13:51:37 +02:00
Mojca Lorber e8f24b18e2 Fix missing icon on shared inventories in global search 2019-09-10 11:20:18 +02:00
Miha Mencin 33d495956e
Merge pull request #2040 from biosistemika/SCI3818-unshared-inventory-screen 
adding missing file
 2019-09-09 16:47:47 +02:00
Miha Mencin 01628e1efc adding missing file 2019-09-09 16:46:51 +02:00
aignatov-bio 01d6a17f2b
Fix permission check for inventory (#2039) 2019-09-09 15:11:18 +02:00
Alex Kriuchykhin b8a5b1b542
Merge pull request #2036 from okriuchykhin/ok_SCI_3815 
Improve behavior of inventory items export modal [SCI-3815]
 2019-09-09 11:08:02 +02:00
Alex Kriuchykhin 1714212630
Merge pull request #2035 from okriuchykhin/ok_SCI_3827 
Add local sorting for ProtocolsIO [SCI-3827]
 2019-09-09 10:55:22 +02:00
aignatov-bio 16ae00782a
Fix new step button on empty task [SCI-3826] (#2026) 
* Fix new step button on empty task

* Fix markup
 2019-09-09 10:43:38 +02:00
aignatov-bio fdce4e6c7c
Remove link to archived project page (#2037) 2019-09-09 10:43:08 +02:00
Oleksii Kriuchykhin 265047caf3 Improve behaviour of inventory items export modal [SCI-3815] 2019-09-09 10:38:47 +02:00
Miha Mencin 12d6804263
Merge pull request #2034 from biosistemika/SCI3818-unshared-inventory-screen 
SCI-3818-unshared-inventory-screen
 2019-09-09 09:30:34 +02:00
Miha Mencin d522b3807a codestyle improvements 2019-09-06 14:59:30 +02:00
Miha Mencin 7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Oleksii Kriuchykhin 6f7ef25514 Add local sorting for ProtocolsIO [SCI-3827] 2019-09-05 14:49:16 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00