Commit graph

217 commits

Author SHA1 Message Date
aignatov-bio e682a3e5d9
Fix steps description and table saving (#1984) 2019-08-21 11:05:49 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Oleksii Kriuchykhin 423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Urban Rotnik 4699ba718a Fix showing errors 2019-07-26 11:32:51 +02:00
Oleksii Kriuchykhin 5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Anton Ignatov 3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio 4fe0227d8c
Add metadata for .eln assets (#1942) 2019-07-19 10:53:33 +02:00
Anton Ignatov 1e8663548e Add MarvinJS assets to TinyMCE 2019-07-16 13:40:54 +02:00
Anton Ignatov 3339c1fbbf Add MarvinJS to Result and TinyMce MarvinJS refactor 2019-07-15 17:17:14 +02:00
Jure Grabnar d210b0b152 Trigger loading of latest publications when page is loaded
Closes SCI-3670
2019-07-15 08:52:17 +02:00
mlorb 5bc8eb7392
Merge pull request #1921 from mlorb/ml-sci-3641
Fix page redirect and add success flash msg after protocols.io import [SCI-3641]
2019-07-12 15:52:40 +02:00
Anton Ignatov ffd415d409 Inital refactor for Assets model 2019-07-12 15:02:06 +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
Mojca Lorber f8afc92606 Fix page redirect and add success flash msg after protocols.io import action 2019-07-11 09:50:39 +02:00
Jure Grabnar 5eb197127f Fix relative links in protocolsio iframe
Closes SCI-3660
2019-07-10 19:20:40 +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
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
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 99b1075c28
Fix protcol naming when load multiple protocols (#1904) 2019-07-08 12:51:47 +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 20134c9f8a
Features/protocolsio integration (#1893)
Features/protocolsio integration
2019-07-03 17:32:20 +02:00
aignatov-bio d2849c88fd
Remove draft after save step (#1878) 2019-07-03 09:18:52 +02:00
aignatov-bio 378e91b426
Fix links on search page (#1867) 2019-07-02 11:21:00 +02:00
Oleksii Kriuchykhin 4ea6b56582 Fix Step and Result file previews [SCI-3539] 2019-07-01 23:30:20 +02:00
aignatov-bio a08d93376c
Add promo modal when MarvinJS disabled (#1872) 2019-07-01 11:51:13 +02:00
Oleksii Kriuchykhin 2f39b7f22b Fix TinyMCE editor initialization for step editing [SCI-3511] 2019-06-28 12:06:04 +02:00
Jure Grabnar 5430fb311d Hound fixes 2019-06-28 10:41:20 +02:00
Jure Grabnar 1a9fca87d2 Fix non-existent protocol-card in preview banner 2019-06-28 08:49:12 +02:00
Jure Grabnar 149f45f4fc Hound fixes 2019-06-28 02:31:25 +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 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 7d71608166 Add spinner to external preview 2019-06-26 19:43:35 +02:00
Anton Ignatov 7e5c39d3e4 Merge branch 'master' into features/marvinjs-integration 2019-06-21 14:51:45 +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
Jure Grabnar b2b752fcf8 Fix hound complaints 2019-06-19 23:37:04 +02:00
Jure Grabnar b3c3b68dc2 Add external preview to External Protocols tab
Closes SCI-3563
2019-06-19 22:54:20 +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 81d10c8ce4
Remove recent protocol button on new step (#1841) 2019-06-19 12:49:22 +02:00
Oleksii Kriuchykhin a855eade4c Merge branch 'master' into ok_SCI_3461 2019-06-11 17:48:02 +02:00
Oleksii Kriuchykhin 6e1a7a3392 Implement saving of attachments ordering on steps [SCI-3436] 2019-06-11 10:08:33 +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