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

4743 commits

Author SHA1 Message Date
Oleksii Kriuchykhin 2298ba4e4e Add path method to custom ActiveStorage S3 service [SCI-3765] 2019-08-21 14:33:28 +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 6fda5401f5
Fix protocol import (#1981) 2019-08-14 09:06:25 +02:00
aignatov-bio 710af85743
Fix template generating (#1980) 2019-08-14 09:06:12 +02:00
Alex Kriuchykhin 960e69eaa8 Fix wopi file download URL [SCI-3757] (#1975) 2019-08-14 09:06:00 +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
Oleksii Kriuchykhin 32054c5516 Handle situation for assets without blob in list sorting [SCI-3757] 2019-08-09 15:17:19 +02:00
Oleksii Kriuchykhin c352a73d79 ActiveStorage fixies after latest master merge [SCI-3757] 2019-08-09 14:56:00 +02:00
aignatov-bio 6e5f078dea
Add activities for marvinJS [SCI-3630] (#1950) 
* Add marvinJs activities to step and results

* Add activities for TinyMCE marvinJS assets

* Fix markup
 2019-08-09 09:47:07 +02:00
Oleksii Kriuchykhin a5d47e75c5 Remove duplicated protocols.js.erb file [SCI-3678] 2019-08-08 14:33:07 +02:00
Oleksii Kriuchykhin d52df56fc4 Fix production build and update packages [SCI-3678] 2019-08-08 14:03:15 +02:00
Oleksii Kriuchykhin 973efa55e1 Merge branch 'master' into ok_SCI_3678 2019-08-08 11:17:07 +02:00
Oleksii Kriuchykhin b4f632dba8 Remove dowload endpoint from assets controller [SCI-3680] 2019-08-07 15:21:41 +02:00
Oleksii Kriuchykhin d942788581 Implement read permissions checks for ActiveStorage controllers [SCI-3680] 2019-08-07 15:21:41 +02:00
Alex Kriuchykhin 328f8dd8a0
Merge pull request #1966 from okriuchykhin/ok_SCI_3681 
Enforce file size limits for direct uploads on S3 [SCI-3681]
 2019-08-07 10:49:05 +02:00
aignatov-bio aa5061a1af
Add custom context menu to TinyMCE images [SCI-3582] (#1944) 
* Add custom context menu to TinyMCE images

* Fix permission check for unsaved objects

* Fix markup
 2019-08-07 10:28:42 +02:00
Oleksii Kriuchykhin 973fc775c0 Enforce file size limits for direct uploads on S3 [SCI-3681] 2019-08-06 17:09:00 +02:00
Oleksii Kriuchykhin f3849e2ece Fix TinyMCE plugings config [SCI-3679] 2019-08-06 15:46:55 +02:00
Oleksii Kriuchykhin eaf9d59819 Merge branch 'activestorage_migration' into ok_SCI_3679 2019-08-06 15:27:31 +02:00
Urban Rotnik 50045b9796
Merge pull request #1956 from urbanrotnik/ur-sci-3733-add-button-new 
Add additional NewStep button [SCI-3733]
 2019-08-06 15:26:51 +02:00
Oleksii Kriuchykhin 423528933e Switch to global JS constants [SCI-3679] 2019-08-06 15:06:19 +02:00
Anton Ignatov e2e876b2a3 Merge branch 'activestorage_migration' into ai-sci-3728-fix-active-storage-tests 2019-08-05 13:51:04 +02:00
Jure Grabnar a9d67ba151
[SCI-3588] Security precautions for omniauth CVE-2015-9284 (#1961) 
[SCI-3588] Security precautions for omniauth CVE-2015-9284
 2019-08-05 13:14:21 +02:00
Jure Grabnar d9ce3e5e8e
[SCI-3674] Remove width on comments (#1954) 
[SCI-3674] Remove width on comments
 2019-08-05 13:14:03 +02:00
aignatov-bio f0b7771e19
Merge pull request #1943 from aignatov-bio/ai-sci-3629-add-metadata-to-protocol-repository-import-export 
Fix protocol copy, add metadata to assets [SCI-3629]
 2019-08-05 12:55:16 +02:00
Anton Ignatov feadd940f7 Fix duplicate for TinyMCE model 2019-08-05 11:33:49 +02:00
Anton Ignatov 24da016465 Reuse duplicate file method 2019-08-05 11:30:36 +02:00
Jure Grabnar d9f6c249f9 Fix CVE-2015-9284 omniauth security precautions 
Close SCI-3588
 2019-07-31 16:59:38 +02:00
Jure Grabnar 6546bd1532 Add omniauth-rails_csrf_protection gem 
Close SCI-3588
 2019-07-31 16:05:06 +02:00
Jure Grabnar b12403b769 Add comment name fix as Urban suggested 2019-07-31 09:23:22 +02:00
Jure Grabnar 971f52b4b0
RTE image in search does not have preview (#1952) 
RTE image in search does not have preview
 2019-07-30 07:44:54 +02:00
Jure Grabnar dbebde3370
Merge pull request #1953 from jbargu/jg_sci_3673 
Revalidate internal dimension when dragging
 2019-07-30 07:44:36 +02:00
Anton Ignatov 7e379d4e0d Fix download file 2019-07-29 10:24:31 +02:00
Anton Ignatov f35f4886a3 Fix markup 2019-07-29 10:18:34 +02:00
Anton Ignatov a4b2825258 Fix tests for active storage 2019-07-26 15:58:51 +02:00
Anton Ignatov 618f0cc334 Fix tests for services 2019-07-26 14:16:44 +02:00
Urban Rotnik 7626d43ee4
Merge pull request #1947 from urbanrotnik/ur-sci-3707-archived-results-not-in-row 
Fix for archived results in row [SCI-3707]
 2019-07-26 13:03:34 +02:00
Oleksii Kriuchykhin ccf76b8531 Move repository_datatable to JS file [SCI-3679] 2019-07-26 13:00:25 +02:00
Anton Ignatov 84fe10df47 Fix tests for models and tema import/export 2019-07-26 12:40:36 +02:00
Urban Rotnik 4699ba718a Fix showing errors 2019-07-26 11:32:51 +02:00
Urban Rotnik 88fbd6c0af Fix for archived results in row 2019-07-26 11:16:53 +02:00
Urban Rotnik aa36d93bea Add additional NewStep button 2019-07-26 11:01:36 +02:00
Oleksii Kriuchykhin 5e65b07bdc Implement DirectUpload for Steps, Results and Inventories [SCI-3679] 2019-07-25 18:00:24 +02:00
Jure Grabnar 39fbd18316 Remove width on commments 
Closes SCI-3674
 2019-07-25 16:46:27 +02:00
Jure Grabnar a579328614 Revalidate internal dimension when dragging 
Close SCI-3673
 2019-07-25 16:37:15 +02:00
Jure Grabnar d3a5651998 Add remaining missing description in global search 
Close SCI-3723
 2019-07-25 14:27:53 +02:00
Jure Grabnar 11b3b7b4e9 Fix search description for step 2019-07-25 14:15:45 +02:00
Jure Grabnar f44404a1f8
Merge pull request #1946 from jbargu/jg_sci_3704 
Fix Handsontable error when generation report
 2019-07-25 11:28:46 +02:00
Jure Grabnar 06657dbdf6
Add spinner when editing image annotation (#1948) 
Add spinner when editing image annotation
 2019-07-25 11:28:13 +02:00