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
6585 commits 70 branches 179 tags 165 MiB
Commit graph

1925 commits

Author SHA1 Message Date
aignatov-bio a39a95d2a7
Merge pull request #2122 from aignatov-bio/ai-sci-disable-autosave-feature 
Disable autosave notification feature
 2019-10-04 09:17:16 +02:00
aignatov-bio 9e7eff9615
Merge pull request #2120 from aignatov-bio/ai-sci-3946-remove-image-icon-from-preview 
Remove image icon from preview [SCI-3946]
 2019-10-04 09:16:47 +02:00
aignatov-bio c2c8343c57
Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search 
Fix MarvinJS representation in global search [SCI-3943]
 2019-10-04 09:16:34 +02:00
aignatov-bio af69e12d1e Disable autosave notification feature 2019-10-04 09:13:42 +02:00
aignatov-bio 0cbc699c62 Remove image icon from preview 2019-10-03 15:44:03 +02:00
aignatov-bio e35617208d
Merge pull request #2118 from aignatov-bio/ai-sci-3841-enable-additional-tools 
Enable additional tools [SCI-3841]
 2019-10-03 11:24:31 +02:00
aignatov-bio 65b1e0c041 Fix reload page 2019-10-03 11:19:12 +02:00
aignatov-bio 9000438025 Enable additional tools 2019-10-03 11:07:19 +02:00
aignatov-bio 301b37cccd Fix duplicate code in file preview 2019-10-03 10:55:54 +02:00
Oleksii Kriuchykhin dd7f2fe095 Fix large preview for documents [SCI-3938] 2019-10-01 16:14:28 +02:00
Oleksii Kriuchykhin 6a6a43f5ff Improve file processing indicator [SCI-3938] 2019-10-01 15:20:46 +02:00
aignatov-bio 675d5eb088 Fix MarvinJS representation in global search 2019-10-01 14:20:20 +02:00
aignatov-bio b8e917455a
Merge pull request #2104 from aignatov-bio/ai-sci-3907-update-marvin-js-asset-in-result-on-cancel 
Update MarvinJS asset on result text cancel [SCI-3907]
 2019-10-01 13:39:01 +02:00
Anton Ignatov 33497d11a3 Merge branch 'activestorage_migration' 2019-10-01 10:36:05 +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
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
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
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 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
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 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
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
Mojca Lorber 4263edf0cc Fix inventory item selection when previewing file 2019-09-18 15:08:40 +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 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 d028856fe0
Fix hidden buttons in inventory (#2063) 2019-09-18 11:36:30 +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
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
aignatov-bio 40b5b2406b
Fix big inventory names (#2046) 2019-09-11 15:44:38 +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
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
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 7fc5035d2d PR fixes, codestyle fixes 2019-09-06 13:47:06 +02:00
Miha Mencin 2486bd0077 SCI3818-unshared-inventory-screen 2019-09-05 14:03:08 +02:00
aignatov-bio 15dc25cee9
Fix handson table initialization [SCI-3749] (#2021) 
* Fix handson table initialization

* Fix markup
 2019-09-05 08:35:28 +02:00
aignatov-bio b8e68e02a1
Fix error, when cancel tag editing (#2025) 2019-09-05 08:34:33 +02:00
aignatov-bio 481be7b92e
Fix padding to share modal (#2024) 2019-09-03 12:06:16 +02:00
mlorb ba5bebedb2 change inlane editing css, add shared inventory subtitle and add tooltips to shared inventories icons (#2022) 2019-09-02 10:30:29 +02:00
aignatov-bio d209b3abcd
Update share modal window [SCI-3812] (#2018) 
* Update share modal window

* Fix markup
 2019-08-29 13:45:27 +02:00
Miha Mencin 0058198bb5
Merge branch 'master' into SCI-3806-shared-status-dropdown 2019-08-26 11:55:25 +02:00
mlorb ffe06d5070
Merge pull request #2010 from mlorb/ml-sci-3805 
Add a team name to inventory item card [SCI-3805]
 2019-08-26 11:29:12 +02:00
aignatov-bio 66326d90e5
Fix shared icon show/hidden (#2014) 2019-08-26 11:24:22 +02:00
aignatov-bio b3e3c443f0
Fix big gap in title of navbar (#2015) 2019-08-26 11:20:03 +02:00
Miha Mencin 9e9e698778 SCI-3806 Add an icon indicating shared status to dropdown 2019-08-26 09:14:37 +02:00
Mojca Lorber 50c78f182c Add a team name to inventory item card 2019-08-23 11:13:58 +02:00
aignatov-bio d70b7e2272
Make share status icon dynamic (#2007) 2019-08-21 15:32:57 +02:00
aignatov-bio f94b8165dc
Fix marvinjs edit button and icon (#1985) 2019-08-21 11:15:57 +02:00
aignatov-bio e682a3e5d9
Fix steps description and table saving (#1984) 2019-08-21 11:05:49 +02:00
aignatov-bio 4730e7bfee
Change notification counter position (#2000) 2019-08-21 10:39:56 +02:00
aignatov-bio 0b85dcbead
Fix long inventory names (#1999) 2019-08-21 10:39:48 +02:00
aignatov-bio e2ad383c69
Fix UX for task inventory dropdown and big task title [SCI-3791] (#1998) 
* Fix ux for task inventory dropdown and big task title

* Fix markup
 2019-08-21 10:39:37 +02:00
aignatov-bio a505ef2462
Fix error in inventories for new teams [SCI-3788] (#1992) 
* Fix error in inventories for new teams

* Replace with current team
 2019-08-19 14:01:48 +02:00
aignatov-bio 2cf7f52f15
Add inline editing for inventories [SCI-3763] (#1991) 
* Add inline editing for inventories

* Remove old locals

* Markup fix
 2019-08-19 13:30:56 +02:00
aignatov-bio d4aedbb35f
Small ux changes for inventories (#1989) 2019-08-19 09:24:10 +02:00
Miha Mencin 5adb745743
Merge pull request #1987 from aignatov-bio/ai-sci-3785-fix-assign-unassing-buttons 
Fix assign/unassign buttons [SCI-3785]
 2019-08-19 08:51:14 +02:00
Anton Ignatov ec57e0aa91 Fix assign/unassign buttons 2019-08-16 10:05:01 +02:00
Urban Rotnik 89f289660b Add share_with_all feature to service, add new activities 2019-08-14 11:03:15 +02:00
aignatov-bio 737f9e572c
Replace marvinJS logo and fix some merge issues [SCI-3731] (#1976) 
* Replace marvinJS logo and fix some merge issues

* Fix tests
 2019-08-13 11:04:19 +02:00
aignatov-bio aad726ac40
Update CSS for share modal (#1978) 2019-08-12 15:02:16 +02:00
Urban Rotnik 61af9e21ad Fix datatable filter position 2019-08-09 14:22:24 +02:00
Urban Rotnik d04b0ccff1 Move '+ new inventory' link above list in sidebar 2019-08-09 14:15:51 +02:00
Urban Rotnik 7719b825e3 Update wording for sharing activities, rename button, add view-only paragraph 2019-08-09 14:15:51 +02:00
Urban Rotnik 32783576c1 Add controller action 'multiple_update' 
Add controller action, add update permission activity, add JS for handling ajax req
 2019-08-09 14:15:50 +02:00
Urban Rotnik 2648521924 Invite modal with form 2019-08-09 14:15:49 +02:00
Urban Rotnik 466b05a5bc Update repository index page 2019-08-09 14:15:48 +02:00
Mojca Lorber 26bd81621f Add new icons also to the inventories list in navigation 2019-08-09 14:13:02 +02:00
Mojca Lorber 7d4941015f Update global search, so it will be able to search through shared inventories 2019-08-09 14:13:01 +02:00