scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6638 commits 70 branches 179 tags 165 MiB
Commit graph

6638 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Ignatov b382eb607b Fix docx report for active storage 2019-10-01 10:26:24 +02:00
Jure Grabnar 45aa057378 Enable cucumber tests 2019-09-30 22:35:15 +02:00
Jure Grabnar 6db8b48d16 Fix cucumber tests 
Close SCI-3916
 2019-09-30 22:34:33 +02:00
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 4d9156ebf7 Add chromium-driver patch from Alex 2019-09-30 16:08:44 +02:00
Jure Grabnar 4b605d357a
[SCI-3751] Improve the auto-save functionality on RTF fields (#2086) 
[SCI-3751] Improve the auto-save functionality on RTF fields
 2019-09-30 15:09:32 +02:00
Jure Grabnar 9f704559ef Fix hound formatting issues 2019-09-30 14:42:15 +02:00
Urban Rotnik 248da9475f
Merge pull request #2102 from urbanrotnik/ur-sci-3929-missing-border 
Fixed missing border, counter, buttons position [SCI-3929]
 2019-09-30 14:34:02 +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
Miha Mencin 126c29ab12
Merge pull request #2101 from biosistemika/SCI-3937-disable-cucumber-tests 
SCI-3937 disable cucumber tests
 2019-09-30 11:54:10 +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
Miha Mencin 5a0fff18ba SCI-3937 remove cucumber tests from ci tests 2019-09-30 10:34:58 +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
Urban Rotnik 47a46ecca1
Merge pull request #2099 from urbanrotnik/ur-sci-change-migrations-order-back 
Change migrations order back
 2019-09-27 16:31:53 +02:00
Urban Rotnik 60a414c4ec Change migrations order back 2019-09-27 16:20:56 +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
Miha Mencin 11881e54a5
Merge pull request #2062 from aignatov-bio/ai-sci-fix-routes-for-addons-installer 
Fix routes for addons installer
 2019-09-27 10:52:16 +02:00
Alex Kriuchykhin d8a2ed0918
Merge pull request #2073 from okriuchykhin/ok_SCI_3890 
Switch to Rails 6.0 app defaults with zeitwerk loader [SCI-3890]
 2019-09-27 10:50:55 +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
Luka Murn 39b3868680
Merge pull request #2093 from Ducz0r/lm-active-mailer-config-minor-changes 
ActiveMailer minor config changes
 2019-09-27 10:17:05 +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
Jure Grabnar 9682fdd73b
[SCI-3924] Export all email and notification is not receive (#2095) 
[SCI-3924] Export all email and notification is not receive
 2019-09-27 10:09:41 +02:00
Jure Grabnar 9a86b2422b
Merge pull request #2092 from jbargu/jg_change_migration_order 
Change migration order for active storage
 2019-09-27 10:09:20 +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
Jure Grabnar c748513ca9 Rename Active storage migration to a later date 2019-09-26 13:55:30 +02:00