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

6269 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Kriuchykhin 887faeb344
Merge pull request #1955 from okriuchykhin/ok_SCI_3679 
Implement DirectUpload for Steps, Results and Inventories [SCI-3679]
 2019-08-06 16:09:13 +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
Jure Grabnar dc48e8b339
[SCI-3567] Add check_pending! call for test migrations (#1960) 
[SCI-3567] Add check_pending! call for test migrations
 2019-08-06 14:11:34 +02:00
aignatov-bio 988cb68d10
Merge pull request #1958 from aignatov-bio/ai-sci-3728-fix-active-storage-tests 
Fix tests for active storage [SCI-3728]
 2019-08-06 11:12:33 +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
Oleksii Kriuchykhin a2fe4bee94 Add text extraction from MarvinJS for search [SCI-3643] 2019-08-02 15:17:28 +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 c63737f750 Add check_pending! call for test migrations 
Close SCI-3567
 2019-07-31 14:57:47 +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
Urban Rotnik 916ff06f99
Merge pull request #1945 from urbanrotnik/ur-sci-3708-missing-error-message-at-import 
Fix showing errors [SCI-3708]
 2019-07-26 13:01:19 +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
Urban Rotnik a472efc968
Merge pull request #1949 from urbanrotnik/ur-sci-3724-file-preview-problem-safari 
Fix for file annotating on Safari [SCI-3724]
 2019-07-24 14:42:03 +02:00
Urban Rotnik 1b9db2f61e Fix for file annotating on Safari 2019-07-24 14:16:29 +02:00
Jure Grabnar cdad167be2 Add spinner when editing image annotation 
Close SCI-3710
 2019-07-23 15:02:33 +02:00
Jure Grabnar 5847a8b05c Convert HOT table after it was initialized 
Closes SCI-3704
 2019-07-23 14:17:22 +02:00
Miha Mencin daccad1346
Merge pull request #1928 from NicolasCARPi/patch-1 
Improve "make run" command
 2019-07-22 17:20:26 +02:00
Anton Ignatov 3b7f715e0b Merge branch 'activestorage_migration' into features/marvinjs-integration 2019-07-22 13:09:17 +02:00
aignatov-bio cd40084c82
Merge pull request #1876 from aignatov-bio/ai-sci-3624-refactor-marvin-js-over-active-storage 
Refactor MarvinJS core over active storage [SCI-3624]
 2019-07-22 10:53:37 +02:00
Anton Ignatov b762ae6a90 Copy protocol assets through tempfile 2019-07-19 15:23:34 +02:00