From ef78f81e3cdd1f237d0429bceff9f244d4e3e255 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 20 Aug 2019 21:50:47 +0000 Subject: [PATCH 001/207] Bump laravel/framework from 5.8.32 to 5.8.33 Bumps [laravel/framework](https://github.com/laravel/framework) from 5.8.32 to 5.8.33. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/5.8/CHANGELOG-5.8.md) - [Commits](https://github.com/laravel/framework/compare/v5.8.32...v5.8.33) Signed-off-by: dependabot-preview[bot] --- composer.lock | 151 +++++++++++++++++++++++++++++++------------------- 1 file changed, 94 insertions(+), 57 deletions(-) diff --git a/composer.lock b/composer.lock index 477b5b01e..2fc70e8e5 100644 --- a/composer.lock +++ b/composer.lock @@ -1041,7 +1041,29 @@ "GuzzleHttp\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2018-04-22T15:46:56+00:00" }, { "name": "guzzlehttp/promises", @@ -1739,16 +1761,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.32", + "version": "v5.8.33", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ee16d719516dfd77ed6c9538000bca49ded284e2" + "reference": "58b81842cbdcfbbd8302790ac0f98119ea1c56e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ee16d719516dfd77ed6c9538000bca49ded284e2", - "reference": "ee16d719516dfd77ed6c9538000bca49ded284e2", + "url": "https://api.github.com/repos/laravel/framework/zipball/58b81842cbdcfbbd8302790ac0f98119ea1c56e5", + "reference": "58b81842cbdcfbbd8302790ac0f98119ea1c56e5", "shasum": "" }, "require": { @@ -1882,7 +1904,7 @@ "framework", "laravel" ], - "time": "2019-08-13T14:11:52+00:00" + "time": "2019-08-20T15:45:17+00:00" }, { "name": "laravel/socialite", @@ -2054,9 +2076,9 @@ "authors": [ { "name": "Roumen Damianoff", + "role": "Developer", "email": "roumen@damianoff.com", - "homepage": "https://damianoff.com", - "role": "Developer" + "homepage": "https://damianoff.com" } ], "description": "Laravelium Sitemap package for Laravel.", @@ -2129,9 +2151,9 @@ "authors": [ { "name": "Colin O'Dell", + "role": "Lead Developer", "email": "colinodell@gmail.com", - "homepage": "https://www.colinodell.com", - "role": "Lead Developer" + "homepage": "https://www.colinodell.com" } ], "description": "PHP Markdown parser based on the CommonMark spec", @@ -2329,9 +2351,9 @@ "authors": [ { "name": "Ben Corlett", + "role": "Developer", "email": "bencorlett@me.com", - "homepage": "http://www.webcomm.com.au", - "role": "Developer" + "homepage": "http://www.webcomm.com.au" } ], "description": "OAuth 1.0 Client Library", @@ -2641,9 +2663,9 @@ "authors": [ { "name": "Muharrem ERİN", + "role": "Developer", "email": "me@mewebstudio.com", - "homepage": "https://github.com/mewebstudio", - "role": "Developer" + "homepage": "https://github.com/mewebstudio" } ], "description": "Laravel 5 HtmlPurifier Package", @@ -3079,9 +3101,7 @@ "version": "1.0.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/fileicon-svg/-/fileicon-svg-1.0.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/fileicon-svg/-/fileicon-svg-1.0.0.tgz" }, "type": "npm-asset", "license": [ @@ -3176,8 +3196,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/lodash/lodash/zipball/f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30", - "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30", - "shasum": null + "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" }, "type": "npm-asset", "license": [ @@ -3225,9 +3244,7 @@ "version": "0.17.1", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.17.1.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.17.1.tgz" }, "type": "npm-asset", "license": [ @@ -3554,18 +3571,18 @@ "authors": [ { "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "role": "Developer", + "email": "arne@blankerts.de" }, { "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpeople.de" }, { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpunit.de" } ], "description": "Library for handling version information and constraints", @@ -3841,7 +3858,27 @@ "Psr\\Http\\Message\\": "src/" } }, - "notification-url": "https://packagist.org/downloads/" + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", @@ -4218,8 +4255,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", @@ -4260,9 +4297,9 @@ "authors": [ { "name": "Freek Van der Herten", + "role": "Developer", "email": "freek@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" + "homepage": "https://spatie.be" } ], "description": "Dump databases", @@ -4334,9 +4371,9 @@ "authors": [ { "name": "Freek Van der Herten", + "role": "Developer", "email": "freek@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" + "homepage": "https://spatie.be" } ], "description": "A Laravel 5 package to backup your application", @@ -4382,9 +4419,9 @@ "authors": [ { "name": "Alex Vanderbist", + "role": "Developer", "email": "alex@spatie.be", - "homepage": "https://spatie.be", - "role": "Developer" + "homepage": "https://spatie.be" } ], "description": "Easily create, use and destroy temporary directories", @@ -5867,8 +5904,8 @@ "authors": [ { "name": "Tijs Verkoyen", - "email": "css_to_inline_styles@verkoyen.eu", - "role": "Developer" + "role": "Developer", + "email": "css_to_inline_styles@verkoyen.eu" } ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", @@ -6420,18 +6457,18 @@ "authors": [ { "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "role": "Developer", + "email": "arne@blankerts.de" }, { "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpeople.de" }, { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpunit.de" } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", @@ -6702,8 +6739,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -6753,8 +6790,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", @@ -6795,8 +6832,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Simple template engine.", @@ -6844,8 +6881,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Utility class for timing", @@ -6975,8 +7012,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "The PHP Unit Testing framework.", @@ -7544,8 +7581,8 @@ "authors": [ { "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "role": "Developer", + "email": "arne@blankerts.de" } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", From 9ad2269d88575d8449e7e074bce35581f726694d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 21 Aug 2019 21:42:04 +0000 Subject: [PATCH 002/207] Bump phpunit/phpunit from 7.5.14 to 7.5.15 Bumps [phpunit/phpunit](https://github.com/sebastianbergmann/phpunit) from 7.5.14 to 7.5.15. - [Release notes](https://github.com/sebastianbergmann/phpunit/releases) - [Changelog](https://github.com/sebastianbergmann/phpunit/blob/7.5.15/ChangeLog-7.5.md) - [Commits](https://github.com/sebastianbergmann/phpunit/compare/7.5.14...7.5.15) Signed-off-by: dependabot-preview[bot] --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index 2fc70e8e5..af451211f 100644 --- a/composer.lock +++ b/composer.lock @@ -6943,16 +6943,16 @@ }, { "name": "phpunit/phpunit", - "version": "7.5.14", + "version": "7.5.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff" + "reference": "d79c053d972856b8b941bb233e39dc521a5093f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2834789aeb9ac182ad69bfdf9ae91856a59945ff", - "reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d79c053d972856b8b941bb233e39dc521a5093f0", + "reference": "d79c053d972856b8b941bb233e39dc521a5093f0", "shasum": "" }, "require": { @@ -7023,7 +7023,7 @@ "testing", "xunit" ], - "time": "2019-07-15T06:24:08+00:00" + "time": "2019-08-21T07:05:16+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", From e71bee8157a0f64a0f73f6f17754152c2fd2e771 Mon Sep 17 00:00:00 2001 From: ZsgsDesign Date: Sun, 25 Aug 2019 12:18:45 +0800 Subject: [PATCH 003/207] add fonts-asset composer type --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 724300e7e..30a0ce065 100644 --- a/composer.json +++ b/composer.json @@ -76,12 +76,16 @@ }, "installer-types": [ "bower-asset", - "npm-asset" + "npm-asset", + "fonts-asset" ], "installer-paths": { "public/static/library/{$name}": [ "type:bower-asset", "type:npm-asset" + ], + "public/static/fonts/{$name}": [ + "type:fonts-asset" ] } }, From aa0492a4c44e4432b2a0fde0007d65cdd2479f99 Mon Sep 17 00:00:00 2001 From: Rp12138 <1348308163@qq.com> Date: Mon, 26 Aug 2019 18:44:15 +0800 Subject: [PATCH 004/207] code download basical completed --- .../Ajax/ContestAdminController.php | 30 +++++++ app/Models/ContestModel.php | 85 +++++++++++++++++++ config/filesystems.php | 5 ++ resources/views/contest/board/admin.blade.php | 20 +++++ routes/web.php | 1 + 5 files changed, 141 insertions(+) diff --git a/app/Http/Controllers/Ajax/ContestAdminController.php b/app/Http/Controllers/Ajax/ContestAdminController.php index ae5c7cf8f..3e501e3c6 100644 --- a/app/Http/Controllers/Ajax/ContestAdminController.php +++ b/app/Http/Controllers/Ajax/ContestAdminController.php @@ -9,8 +9,12 @@ use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Jobs\ProcessSubmission; +use Illuminate\Validation\Validator; +use Illuminate\Support\Facades\Storage; +use Log; use Auth; use Cache; +use Response; class ContestAdminController extends Controller { @@ -259,4 +263,30 @@ public function getScrollBoardData(Request $request) $data = $contestModel->getScrollBoardData($cid); return ResponseModel::success(200, null, $data); } + + public function downloadCode(Request $request) + { + $request->validate([ + "cid"=>"required|integer", + ]); + $cid = $request->input('cid'); + $groupModel=new GroupModel(); + $contestModel=new ContestModel(); + if($contestModel->judgeClearance($cid,Auth::user()->id) != 3){ + return ResponseModel::err(2001); + } + + $zip_name=$contestModel->zipName($cid); + if(!(Storage::disk("private")->exists("contestCodeZip/$cid/".$cid.".zip"))){ + $contestModel->GenerateZip("contestCodeZip/$cid/",$cid,"contestCode/$cid/",$zip_name); + } + + $files=Storage::disk("private")->files("contestCodeZip/$cid/"); + response()->download(base_path("/storage/app/private/".$files[0]),$zip_name,[ + "Content-Transfer-Encoding" => "binary", + "Content-Type"=>"application/octet-stream", + "filename"=>$zip_name + ])->send(); + + } } diff --git a/app/Models/ContestModel.php b/app/Models/ContestModel.php index ed7dfc40e..0de26cac1 100644 --- a/app/Models/ContestModel.php +++ b/app/Models/ContestModel.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; use App\Models\Rating\RatingCalculator; +use Illuminate\Support\Facades\Storage; use Auth; use Cache; use Log; @@ -1940,4 +1941,88 @@ public function getScrollBoardData($cid) 'contest' => $contest, ]; } + + public function storageCode($path,$cid) + { + + Storage::disk("private")->makeDirectory($path); + + //example:A-The 3n + 1 problem-UVa100 + + $contest_problems=DB::table("contest_problem")->where([ + "cid"=>$cid + ])->get(); + $problem_info=array(); + foreach($contest_problems as $contest_problem) { + $problem_info[$contest_problem["pid"]]=DB::table("problem")->where([ + "pid"=>$contest_problem["pid"] + ])->first(); + $problem_info[$contest_problem["pid"]]["ncode"]=$contest_problem["ncode"]; + $problem_info[$contest_problem["pid"]]["path"]=$problem_info[$contest_problem["pid"]]["ncode"]."-".$problem_info[$contest_problem["pid"]]["pcode"]."-".$problem_info[$contest_problem["pid"]]["title"]; + Storage::disk("private")->makeDirectory($path."/".urlencode($problem_info[$contest_problem["pid"]]["path"])."/"); + } + + $compilers=DB::table("compiler")->get(); + $language=array(); + foreach($compilers as $compiler) { + $language[$compiler["coid"]]=$compiler["lang"]; + } + + //example:12345-admin-A-Accepted.cpp + + $submissions=DB::table("submission")->where([ + "cid"=>$cid, + ])->get(); + foreach($submissions as $submission) { + $user_name=DB::table("users")->where([ + "id"=>$submission["uid"] + ])->first(); + $SubmissionModel=new SubmissionModel(); + $suffix_name=isset($SubmissionModel->langConfig[$language[$submission["coid"]]]) ? $SubmissionModel->langConfig[$language[$submission["coid"]]]["extensions"][0] : $SubmissionModel->langConfig["plaintext"]["extensions"][0]; + //die($submission["sid"]); + $file_name=(string)($submission["sid"])."-".$user_name["name"]."-".$problem_info[$submission["pid"]]["ncode"]."-".$submission["verdict"].$suffix_name; + Storage::disk("private")->put($path."/".urlencode($problem_info[$submission["pid"]]["path"])."/".$file_name, $submission["solution"]); + } + } + + public function GenerateZip($path,$cid,$code_path,$outputFilename) + { + Storage::disk("private")->deleteDirectory($code_path); + + $this->storageCode($code_path,$cid); + + Storage::disk("private")->makeDirectory($path); + + // create new archive + $zipFile = new \PhpZip\ZipFile(); + $directories = Storage::disk("private")->allDirectories($code_path); + try{ + foreach($directories as $directorie) + { + + preg_match("/contestCode\/\d+(.*)/",$directorie,$problem_name); + $zipFile->addDir(base_path('storage/app/private/'.$directorie),urldecode($problem_name[1]));// add files from the directory + } + $zipFile + ->saveAsFile(base_path('storage/app/private/'.$path.$cid.".zip")); // save the archive to a file + //->extractTo(base_path('storage/app/private/'.$path)); // extract files to the specified directory + } + catch(\PhpZip\Exception\ZipException $e){ + // handle exception + Log::debug($e); + } + finally{ + $zipFile->close(); + } + } + + public function zipName($cid) + { + //example:12345-name-2019-08-15 20:41:00.zip + + $contest=DB::table("contest")->where([ + "cid"=>$cid + ])->first(); + return $outputFilename=(string)($contest["cid"])."-".$contest["name"].".zip"; + } } diff --git a/config/filesystems.php b/config/filesystems.php index 6d1fa171c..d8af44997 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -71,6 +71,11 @@ 'url' => env('AWS_URL'), ], + 'private' => [ + 'driver' => 'local', + 'root' => storage_path('app/private'), + 'visibility' => 'private', + ] ], ]; diff --git a/resources/views/contest/board/admin.blade.php b/resources/views/contest/board/admin.blade.php index 463e29292..5a31ce14a 100644 --- a/resources/views/contest/board/admin.blade.php +++ b/resources/views/contest/board/admin.blade.php @@ -122,6 +122,9 @@ + @if($is_end && $basic['froze_length'] != 0)
    Scroll Board @@ -221,5 +224,22 @@ function generateAccount(){ } }); } + + function downloaAllCode(){ + $.ajax({ + type: 'GET', + url: '/ajax/contest/downloadCode', + data: { + cid: {{$cid}}, + },dataType: 'json', + headers: { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + }, success: function(ret){ + + }, error: function(xhr, type){ + + } + }); + } @endsection diff --git a/routes/web.php b/routes/web.php index 47a4be578..0d9dca0de 100644 --- a/routes/web.php +++ b/routes/web.php @@ -190,6 +190,7 @@ Route::post('setClarificationPublic', 'ContestAdminController@setClarificationPublic')->middleware('auth'); Route::post('generateContestAccount', 'ContestAdminController@generateContestAccount')->middleware('auth'); Route::post('getScrollBoardData', 'ContestAdminController@getScrollBoardData')->middleware('auth')->name('ajax.contest.getScrollBoardData'); + Route::get('downloadCode', 'ContestAdminController@downloadCode')->middleware('auth'); }); Route::group(['prefix' => 'submission'], function () { From 178e91cbd923cc48f77c509ee1bddd720a197f14 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2019 22:12:04 +0000 Subject: [PATCH 005/207] Bump graham-campbell/markdown from 11.0.0 to 11.1.0 Bumps [graham-campbell/markdown](https://github.com/GrahamCampbell/Laravel-Markdown) from 11.0.0 to 11.1.0. - [Release notes](https://github.com/GrahamCampbell/Laravel-Markdown/releases) - [Changelog](https://github.com/GrahamCampbell/Laravel-Markdown/blob/master/CHANGELOG.md) - [Commits](https://github.com/GrahamCampbell/Laravel-Markdown/compare/v11.0.0...v11.1.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 131 +++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 93 deletions(-) diff --git a/composer.lock b/composer.lock index 97430bfe5..31b2cea77 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3f640b4c9ce1c46b3ea89e775f32e075", + "content-hash": "6b80fe30df29049b4a12bd6d59778b6a", "packages": [ { "name": "composer/installers", @@ -853,22 +853,22 @@ }, { "name": "graham-campbell/markdown", - "version": "v11.0.0", + "version": "v11.1.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git", - "reference": "90f68debfc6611654b16efc5539f5a3b597d55d9" + "reference": "80f545b417db2103122c7f094bfa5bb2444b28e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/90f68debfc6611654b16efc5539f5a3b597d55d9", - "reference": "90f68debfc6611654b16efc5539f5a3b597d55d9", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/80f545b417db2103122c7f094bfa5bb2444b28e1", + "reference": "80f545b417db2103122c7f094bfa5bb2444b28e1", "shasum": "" }, "require": { - "illuminate/contracts": "5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*", - "illuminate/view": "5.5.*|5.6.*|5.7.*|5.8.*", + "illuminate/contracts": "^5.5|^6.0", + "illuminate/support": "^5.5|^6.0", + "illuminate/view": "^5.5|^6.0", "league/commonmark": "^1.0", "php": "^7.1.3" }, @@ -882,7 +882,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "11.0-dev" + "dev-master": "11.1-dev" }, "laravel": { "providers": [ @@ -917,7 +917,7 @@ "laravel", "markdown" ], - "time": "2019-07-01T22:59:29+00:00" + "time": "2019-08-26T16:31:24+00:00" }, { "name": "grubersjoe/bing-daily-photo", @@ -2907,9 +2907,7 @@ "version": "3.7.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/animate.css/-/animate.css-3.7.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/animate.css/-/animate.css-3.7.2.tgz" }, "type": "npm-asset", "license": [ @@ -2921,9 +2919,7 @@ "version": "4.1.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/bootstrap-material-design/-/bootstrap-material-design-4.1.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/bootstrap-material-design/-/bootstrap-material-design-4.1.2.tgz" }, "type": "npm-asset", "license": [ @@ -2935,9 +2931,7 @@ "version": "2.8.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/chart.js/-/chart.js-2.8.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/chart.js/-/chart.js-2.8.0.tgz" }, "require": { "npm-asset/chartjs-color": ">=2.1.0,<3.0.0", @@ -2953,9 +2947,7 @@ "version": "2.3.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.3.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.3.0.tgz" }, "require": { "npm-asset/chartjs-color-string": ">=0.6.0,<0.7.0", @@ -2971,9 +2963,7 @@ "version": "0.6.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz" }, "require": { "npm-asset/color-name": ">=1.0.0,<2.0.0" @@ -2988,9 +2978,7 @@ "version": "2.0.4", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.4.tgz" }, "require": { "npm-asset/good-listener": ">=1.2.2,<2.0.0", @@ -3007,9 +2995,7 @@ "version": "5.48.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/codemirror/-/codemirror-5.48.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/codemirror/-/codemirror-5.48.2.tgz" }, "type": "npm-asset", "license": [ @@ -3021,9 +3007,7 @@ "version": "1.1.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz" }, "require": { "npm-asset/typo-js": "*" @@ -3038,9 +3022,7 @@ "version": "0.5.3", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz" }, "type": "npm-asset" }, @@ -3049,9 +3031,7 @@ "version": "1.1.4", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" }, "type": "npm-asset", "license": [ @@ -3063,9 +3043,7 @@ "version": "3.2.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz" }, "type": "npm-asset", "license": [ @@ -3077,9 +3055,7 @@ "version": "1.0.11", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/dompurify/-/dompurify-1.0.11.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/dompurify/-/dompurify-1.0.11.tgz" }, "type": "npm-asset", "license": [ @@ -3103,9 +3079,7 @@ "version": "1.2.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz" }, "require": { "npm-asset/delegate": ">=3.1.2,<4.0.0" @@ -3120,9 +3094,7 @@ "version": "9.12.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/highlightjs/-/highlightjs-9.12.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/highlightjs/-/highlightjs-9.12.0.tgz" }, "type": "npm-asset", "license": [ @@ -3134,9 +3106,7 @@ "version": "3.4.1", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz" }, "type": "npm-asset", "license": [ @@ -3148,9 +3118,7 @@ "version": "2.5.21", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/jquery-datetimepicker/-/jquery-datetimepicker-2.5.21.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/jquery-datetimepicker/-/jquery-datetimepicker-2.5.21.tgz" }, "require": { "npm-asset/jquery": ">=1.7.2", @@ -3167,9 +3135,7 @@ "version": "3.1.13", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz" }, "type": "npm-asset" }, @@ -3178,9 +3144,7 @@ "version": "1.12.1", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz" }, "type": "npm-asset", "license": [ @@ -3210,9 +3174,7 @@ "version": "0.6.3", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz" }, "type": "npm-asset", "license": [ @@ -3224,9 +3186,7 @@ "version": "2.7.5", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz" }, "type": "npm-asset", "license": [ @@ -3238,9 +3198,7 @@ "version": "2.24.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz" }, "type": "npm-asset", "license": [ @@ -3264,9 +3222,7 @@ "version": "2.1.1", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/pdfobject/-/pdfobject-2.1.1.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/pdfobject/-/pdfobject-2.1.1.tgz" }, "type": "npm-asset", "license": [ @@ -3284,8 +3240,7 @@ "dist": { "type": "zip", "url": "https://api.github.com/repos/kartik-v/php-date-formatter/zipball/d842e1c4e6a8d6108017b726321c305bb5ae4fb5", - "reference": "d842e1c4e6a8d6108017b726321c305bb5ae4fb5", - "shasum": null + "reference": "d842e1c4e6a8d6108017b726321c305bb5ae4fb5" }, "type": "npm-asset", "license": [ @@ -3297,9 +3252,7 @@ "version": "1.15.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz" }, "type": "npm-asset", "license": [ @@ -3311,9 +3264,7 @@ "version": "1.1.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/select/-/select-1.1.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/select/-/select-1.1.2.tgz" }, "type": "npm-asset", "license": [ @@ -3325,9 +3276,7 @@ "version": "1.11.2", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/simplemde/-/simplemde-1.11.2.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/simplemde/-/simplemde-1.11.2.tgz" }, "require": { "npm-asset/codemirror": "*", @@ -3344,9 +3293,7 @@ "version": "2.1.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz" }, "type": "npm-asset", "license": [ @@ -3358,9 +3305,7 @@ "version": "1.0.3", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/typo-js/-/typo-js-1.0.3.tgz", - "reference": null, - "shasum": null + "url": "https://registry.npmjs.org/typo-js/-/typo-js-1.0.3.tgz" }, "type": "npm-asset", "license": [ From 76b3de596148d7f2dc86435d9c98e809c7e42727 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 00:11:15 +0000 Subject: [PATCH 006/207] Bump laravel/framework from 5.8.33 to 5.8.34 Bumps [laravel/framework](https://github.com/laravel/framework) from 5.8.33 to 5.8.34. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/5.8/CHANGELOG-5.8.md) - [Commits](https://github.com/laravel/framework/compare/v5.8.33...v5.8.34) Signed-off-by: dependabot-preview[bot] --- composer.lock | 183 ++++++++++++++++++++++++++------------------------ 1 file changed, 94 insertions(+), 89 deletions(-) diff --git a/composer.lock b/composer.lock index 31b2cea77..f5229294c 100644 --- a/composer.lock +++ b/composer.lock @@ -1727,16 +1727,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.33", + "version": "v5.8.34", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "58b81842cbdcfbbd8302790ac0f98119ea1c56e5" + "reference": "c3a870b96c7afe5174f486af74768ccfddeec77b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/58b81842cbdcfbbd8302790ac0f98119ea1c56e5", - "reference": "58b81842cbdcfbbd8302790ac0f98119ea1c56e5", + "url": "https://api.github.com/repos/laravel/framework/zipball/c3a870b96c7afe5174f486af74768ccfddeec77b", + "reference": "c3a870b96c7afe5174f486af74768ccfddeec77b", "shasum": "" }, "require": { @@ -1870,7 +1870,7 @@ "framework", "laravel" ], - "time": "2019-08-20T15:45:17+00:00" + "time": "2019-08-27T14:35:59+00:00" }, { "name": "laravel/socialite", @@ -2194,16 +2194,16 @@ }, { "name": "league/flysystem", - "version": "1.0.53", + "version": "1.0.55", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "08e12b7628f035600634a5e76d95b5eb66cea674" + "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/08e12b7628f035600634a5e76d95b5eb66cea674", - "reference": "08e12b7628f035600634a5e76d95b5eb66cea674", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6", + "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6", "shasum": "" }, "require": { @@ -2274,7 +2274,7 @@ "sftp", "storage" ], - "time": "2019-06-18T20:09:29+00:00" + "time": "2019-08-24T11:17:19+00:00" }, { "name": "league/oauth1-client", @@ -4474,16 +4474,16 @@ }, { "name": "symfony/console", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9" + "reference": "de63799239b3881b8a08f8481b22348f77ed7b36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", - "reference": "8b0ae5742ce9aaa8b0075665862c1ca397d1c1d9", + "url": "https://api.github.com/repos/symfony/console/zipball/de63799239b3881b8a08f8481b22348f77ed7b36", + "reference": "de63799239b3881b8a08f8481b22348f77ed7b36", "shasum": "" }, "require": { @@ -4545,20 +4545,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-07-24T17:13:59+00:00" + "time": "2019-08-26T08:26:39+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d" + "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/105c98bb0c5d8635bea056135304bd8edcc42b4d", - "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/c6e5e2a00db768c92c3ae131532af4e1acc7bd03", + "reference": "c6e5e2a00db768c92c3ae131532af4e1acc7bd03", "shasum": "" }, "require": { @@ -4598,20 +4598,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-01-16T21:53:39+00:00" + "time": "2019-08-20T14:07:54+00:00" }, { "name": "symfony/debug", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "527887c3858a2462b0137662c74837288b998ee3" + "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/527887c3858a2462b0137662c74837288b998ee3", - "reference": "527887c3858a2462b0137662c74837288b998ee3", + "url": "https://api.github.com/repos/symfony/debug/zipball/afcdea44a2e399c1e4b52246ec8d54c715393ced", + "reference": "afcdea44a2e399c1e4b52246ec8d54c715393ced", "shasum": "" }, "require": { @@ -4654,7 +4654,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-07-23T11:21:36+00:00" + "time": "2019-08-20T14:27:59+00:00" }, { "name": "symfony/dom-crawler", @@ -4719,16 +4719,16 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "212b020949331b6531250584531363844b34a94e" + "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/212b020949331b6531250584531363844b34a94e", - "reference": "212b020949331b6531250584531363844b34a94e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2", + "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2", "shasum": "" }, "require": { @@ -4785,7 +4785,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-06-27T06:42:14+00:00" + "time": "2019-08-26T08:55:16+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -4847,16 +4847,16 @@ }, { "name": "symfony/finder", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2" + "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/9638d41e3729459860bb96f6247ccb61faaa45f2", - "reference": "9638d41e3729459860bb96f6247ccb61faaa45f2", + "url": "https://api.github.com/repos/symfony/finder/zipball/86c1c929f0a4b24812e1eb109262fc3372c8e9f2", + "reference": "86c1c929f0a4b24812e1eb109262fc3372c8e9f2", "shasum": "" }, "require": { @@ -4892,20 +4892,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-06-28T13:16:30+00:00" + "time": "2019-08-14T12:26:46+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "8b778ee0c27731105fbf1535f51793ad1ae0ba2b" + "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/8b778ee0c27731105fbf1535f51793ad1ae0ba2b", - "reference": "8b778ee0c27731105fbf1535f51793ad1ae0ba2b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d804bea118ff340a12e22a79f9c7e7eb56b35adc", + "reference": "d804bea118ff340a12e22a79f9c7e7eb56b35adc", "shasum": "" }, "require": { @@ -4947,20 +4947,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-07-23T11:21:36+00:00" + "time": "2019-08-26T08:55:16+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "a414548d236ddd8fa3df52367d583e82339c5e95" + "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a414548d236ddd8fa3df52367d583e82339c5e95", - "reference": "a414548d236ddd8fa3df52367d583e82339c5e95", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5e0fc71be03d52cd00c423061cfd300bd6f92a52", + "reference": "5e0fc71be03d52cd00c423061cfd300bd6f92a52", "shasum": "" }, "require": { @@ -5039,20 +5039,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-07-28T07:10:23+00:00" + "time": "2019-08-26T16:47:42+00:00" }, { "name": "symfony/mime", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b" + "reference": "987a05df1c6ac259b34008b932551353f4f408df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/6b7148029b1dd5eda1502064f06d01357b7b2d8b", - "reference": "6b7148029b1dd5eda1502064f06d01357b7b2d8b", + "url": "https://api.github.com/repos/symfony/mime/zipball/987a05df1c6ac259b34008b932551353f4f408df", + "reference": "987a05df1c6ac259b34008b932551353f4f408df", "shasum": "" }, "require": { @@ -5061,7 +5061,7 @@ "symfony/polyfill-mbstring": "^1.0" }, "require-dev": { - "egulias/email-validator": "^2.0", + "egulias/email-validator": "^2.1.10", "symfony/dependency-injection": "~3.4|^4.1" }, "type": "library", @@ -5098,7 +5098,7 @@ "mime", "mime-type" ], - "time": "2019-07-19T16:21:19+00:00" + "time": "2019-08-22T08:16:11+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5453,16 +5453,16 @@ }, { "name": "symfony/process", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c" + "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/856d35814cf287480465bb7a6c413bb7f5f5e69c", - "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c", + "url": "https://api.github.com/repos/symfony/process/zipball/e89969c00d762349f078db1128506f7f3dcc0d4a", + "reference": "e89969c00d762349f078db1128506f7f3dcc0d4a", "shasum": "" }, "require": { @@ -5498,20 +5498,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-05-30T16:10:05+00:00" + "time": "2019-08-26T08:26:39+00:00" }, { "name": "symfony/routing", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "a88c47a5861549f5dc1197660818084c3b67d773" + "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a88c47a5861549f5dc1197660818084c3b67d773", - "reference": "a88c47a5861549f5dc1197660818084c3b67d773", + "url": "https://api.github.com/repos/symfony/routing/zipball/ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", + "reference": "ff1049f6232dc5b6023b1ff1c6de56f82bcd264f", "shasum": "" }, "require": { @@ -5574,20 +5574,20 @@ "uri", "url" ], - "time": "2019-07-23T14:43:56+00:00" + "time": "2019-08-26T08:26:39+00:00" }, { "name": "symfony/service-contracts", - "version": "v1.1.5", + "version": "v1.1.6", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d" + "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", - "reference": "f391a00de78ec7ec8cf5cdcdae59ec7b883edb8d", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ea7263d6b6d5f798b56a45a5b8d686725f2719a3", + "reference": "ea7263d6b6d5f798b56a45a5b8d686725f2719a3", "shasum": "" }, "require": { @@ -5632,26 +5632,26 @@ "interoperability", "standards" ], - "time": "2019-06-13T11:15:36+00:00" + "time": "2019-08-20T14:44:19+00:00" }, { "name": "symfony/translation", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "4e3e39cc485304f807622bdc64938e4633396406" + "reference": "28498169dd334095fa981827992f3a24d50fed0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/4e3e39cc485304f807622bdc64938e4633396406", - "reference": "4e3e39cc485304f807622bdc64938e4633396406", + "url": "https://api.github.com/repos/symfony/translation/zipball/28498169dd334095fa981827992f3a24d50fed0f", + "reference": "28498169dd334095fa981827992f3a24d50fed0f", "shasum": "" }, "require": { "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0", - "symfony/translation-contracts": "^1.1.2" + "symfony/translation-contracts": "^1.1.6" }, "conflict": { "symfony/config": "<3.4", @@ -5708,20 +5708,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-07-18T10:34:59+00:00" + "time": "2019-08-26T08:55:16+00:00" }, { "name": "symfony/translation-contracts", - "version": "v1.1.5", + "version": "v1.1.6", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c" + "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/cb4b18ad7b92a26e83b65dde940fab78339e6f3c", - "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", + "reference": "325b17c24f3ee23cbecfa63ba809c6d89b5fa04a", "shasum": "" }, "require": { @@ -5765,20 +5765,20 @@ "interoperability", "standards" ], - "time": "2019-06-13T11:15:36+00:00" + "time": "2019-08-02T12:15:04+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07" + "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e4110b992d2cbe198d7d3b244d079c1c58761d07", - "reference": "e4110b992d2cbe198d7d3b244d079c1c58761d07", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/641043e0f3e615990a0f29479f9c117e8a6698c6", + "reference": "641043e0f3e615990a0f29479f9c117e8a6698c6", "shasum": "" }, "require": { @@ -5841,7 +5841,7 @@ "debug", "dump" ], - "time": "2019-07-27T06:42:46+00:00" + "time": "2019-08-26T08:26:39+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5892,16 +5892,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "5084b23845c24dbff8ac6c204290c341e4776c92" + "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/5084b23845c24dbff8ac6c204290c341e4776c92", - "reference": "5084b23845c24dbff8ac6c204290c341e4776c92", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", + "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", "shasum": "" }, "require": { @@ -5915,7 +5915,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "3.5-dev" } }, "autoload": { @@ -5928,10 +5928,15 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Graham Campbell", + "email": "graham@alt-three.com", + "homepage": "https://gjcampbell.co.uk/" + }, { "name": "Vance Lucas", "email": "vance@vancelucas.com", - "homepage": "http://www.vancelucas.com" + "homepage": "https://vancelucas.com/" } ], "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.", @@ -5940,7 +5945,7 @@ "env", "environment" ], - "time": "2019-06-15T22:40:20+00:00" + "time": "2019-08-27T17:00:38+00:00" } ], "packages-dev": [ From 0839c109313cec3c6bd1fa0632883f8a8367e49f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2019 21:43:06 +0000 Subject: [PATCH 007/207] Bump npm-asset/mathjax from 2.7.5 to 2.7.6 Bumps npm-asset/mathjax from 2.7.5 to 2.7.6. Signed-off-by: dependabot-preview[bot] --- composer.lock | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index f5229294c..7de9d8014 100644 --- a/composer.lock +++ b/composer.lock @@ -3156,13 +3156,13 @@ "version": "4.17.15-patch1", "source": { "type": "git", - "url": "https://github.com/lodash/lodash.git", - "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" + "url": "git@github.com:lodash/lodash.git", + "reference": "10681716750bfbd9ed862817e4dec70963adc492" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lodash/lodash/zipball/f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30", - "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" + "url": "https://api.github.com/repos/lodash/lodash/zipball/10681716750bfbd9ed862817e4dec70963adc492", + "reference": "10681716750bfbd9ed862817e4dec70963adc492" }, "type": "npm-asset", "license": [ @@ -3183,10 +3183,16 @@ }, { "name": "npm-asset/mathjax", - "version": "2.7.5", + "version": "2.7.6", + "source": { + "type": "git", + "url": "https://github.com/mathjax/MathJax.git", + "reference": "d9d24224046bc55eefca3f4793963902d3d88726" + }, "dist": { - "type": "tar", - "url": "https://registry.npmjs.org/mathjax/-/mathjax-2.7.5.tgz" + "type": "zip", + "url": "https://api.github.com/repos/mathjax/MathJax/zipball/d9d24224046bc55eefca3f4793963902d3d88726", + "reference": "d9d24224046bc55eefca3f4793963902d3d88726" }, "type": "npm-asset", "license": [ From ab551507ba7232eabf0ccbba942b6f6a762cb096 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2019 21:40:20 +0000 Subject: [PATCH 008/207] Bump encore/laravel-admin from 1.7.5 to 1.7.6 Bumps [encore/laravel-admin](https://github.com/z-song/laravel-admin) from 1.7.5 to 1.7.6. - [Release notes](https://github.com/z-song/laravel-admin/releases) - [Commits](https://github.com/z-song/laravel-admin/compare/v1.7.5...v1.7.6) Signed-off-by: dependabot-preview[bot] --- composer.lock | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index 7de9d8014..12833d737 100644 --- a/composer.lock +++ b/composer.lock @@ -635,16 +635,16 @@ }, { "name": "encore/laravel-admin", - "version": "v1.7.5", + "version": "v1.7.6", "source": { "type": "git", "url": "https://github.com/z-song/laravel-admin.git", - "reference": "1696ae76863fc7b60ed2c717caef547dc39c30d3" + "reference": "06b6daf94697089620d6eb8c93b20bc4165e9756" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/z-song/laravel-admin/zipball/1696ae76863fc7b60ed2c717caef547dc39c30d3", - "reference": "1696ae76863fc7b60ed2c717caef547dc39c30d3", + "url": "https://api.github.com/repos/z-song/laravel-admin/zipball/06b6daf94697089620d6eb8c93b20bc4165e9756", + "reference": "06b6daf94697089620d6eb8c93b20bc4165e9756", "shasum": "" }, "require": { @@ -702,7 +702,7 @@ "grid", "laravel" ], - "time": "2019-07-24T03:27:03+00:00" + "time": "2019-08-27T11:00:45+00:00" }, { "name": "erusev/parsedown", @@ -3156,13 +3156,13 @@ "version": "4.17.15-patch1", "source": { "type": "git", - "url": "git@github.com:lodash/lodash.git", - "reference": "10681716750bfbd9ed862817e4dec70963adc492" + "url": "https://github.com/lodash/lodash.git", + "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lodash/lodash/zipball/10681716750bfbd9ed862817e4dec70963adc492", - "reference": "10681716750bfbd9ed862817e4dec70963adc492" + "url": "https://api.github.com/repos/lodash/lodash/zipball/f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30", + "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" }, "type": "npm-asset", "license": [ @@ -4664,16 +4664,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.3.3", + "version": "v4.3.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "291397232a2eefb3347eaab9170409981eaad0e2" + "reference": "cc686552948d627528c0e2e759186dff67c2610e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/291397232a2eefb3347eaab9170409981eaad0e2", - "reference": "291397232a2eefb3347eaab9170409981eaad0e2", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/cc686552948d627528c0e2e759186dff67c2610e", + "reference": "cc686552948d627528c0e2e759186dff67c2610e", "shasum": "" }, "require": { @@ -4721,7 +4721,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-06-13T11:03:18+00:00" + "time": "2019-08-26T08:26:39+00:00" }, { "name": "symfony/event-dispatcher", From b8e99a30e0eab209fc593a0e16d2651211ef1e13 Mon Sep 17 00:00:00 2001 From: ZsgsDesign Date: Sun, 1 Sep 2019 23:32:52 +0800 Subject: [PATCH 009/207] add nav for contest panel --- resources/views/contest/board/nav.blade.php | 41 +++++++++++++++++++ resources/views/contest/board/print.blade.php | 34 +-------------- 2 files changed, 42 insertions(+), 33 deletions(-) create mode 100644 resources/views/contest/board/nav.blade.php diff --git a/resources/views/contest/board/nav.blade.php b/resources/views/contest/board/nav.blade.php new file mode 100644 index 000000000..0f8099bec --- /dev/null +++ b/resources/views/contest/board/nav.blade.php @@ -0,0 +1,41 @@ + + + Challenge + Rank + Status + Clarification + Print + @if($basic['practice']) + Analysis + @endif + @if($clearance>2) + Admin + @endif + + diff --git a/resources/views/contest/board/print.blade.php b/resources/views/contest/board/print.blade.php index a5979eacf..1e9bf95fe 100644 --- a/resources/views/contest/board/print.blade.php +++ b/resources/views/contest/board/print.blade.php @@ -25,26 +25,6 @@ text-decoration: none!important; } - nav-div{ - display: block; - margin-bottom: 0; - border-bottom: 2px solid rgba(0, 0, 0, 0.15); - } - - nav-item{ - display: inline-block; - color: rgba(0, 0, 0, 0.42); - padding: 0.25rem 0.75rem; - font-size: 0.85rem; - } - - nav-item.active{ - color: rgba(0, 0, 0, 0.93); - color: #03a9f4; - border-bottom: 2px solid #03a9f4; - margin-bottom: -2px; - } - h5{ margin-bottom: 1rem; font-weight: bold; @@ -54,19 +34,7 @@
    {{$contest_name}}
    - - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis - @endif - @if($clearance>2) - Admin - @endif - + @include('contest.board.nav',['nav'=>'print'])

    Not Supported

    From ff374f21150ca3a3c6c9aca9aa1034b4f9b28ee0 Mon Sep 17 00:00:00 2001 From: ZsgsDesign Date: Sun, 1 Sep 2019 23:42:23 +0800 Subject: [PATCH 010/207] add nav --- resources/views/contest/board/admin.blade.php | 42 +++---------------- .../views/contest/board/analysis.blade.php | 38 +++-------------- .../views/contest/board/challenge.blade.php | 38 +++-------------- .../contest/board/clarification.blade.php | 38 +++-------------- resources/views/contest/board/nav.blade.php | 16 +++---- resources/views/contest/board/print.blade.php | 6 ++- resources/views/contest/board/rank.blade.php | 38 +++-------------- .../views/contest/board/status.blade.php | 38 +++-------------- 8 files changed, 45 insertions(+), 209 deletions(-) diff --git a/resources/views/contest/board/admin.blade.php b/resources/views/contest/board/admin.blade.php index f9bec7989..7bff861c8 100644 --- a/resources/views/contest/board/admin.blade.php +++ b/resources/views/contest/board/admin.blade.php @@ -25,26 +25,6 @@ text-decoration: none!important; } - nav-div{ - display: block; - margin-bottom: 0; - border-bottom: 2px solid rgba(0, 0, 0, 0.15); - } - - nav-item{ - display: inline-block; - color: rgba(0, 0, 0, 0.42); - padding: 0.25rem 0.75rem; - font-size: 0.85rem; - } - - nav-item.active{ - color: rgba(0, 0, 0, 0.93); - color: #03a9f4; - border-bottom: 2px solid #03a9f4; - margin-bottom: -2px; - } - h5{ margin-bottom: 1rem; font-weight: bold; @@ -93,21 +73,11 @@
    {{$contest_name}}
    - - @if(time() >= strtotime($basic['begin_time'])) - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis - @endif - @endif - @if($clearance>2) - Admin - @endif - + @include('contest.board.nav',[ + 'nav'=>'admin', + 'basic'=>$basic, + 'clearance'=>$clearance + ])
    @if($verified) @@ -243,7 +213,7 @@ function downloaAllCode(){ }, success: function(ret){ }, error: function(xhr, type){ - + } }); } diff --git a/resources/views/contest/board/analysis.blade.php b/resources/views/contest/board/analysis.blade.php index 21cc36161..7e09d4b39 100644 --- a/resources/views/contest/board/analysis.blade.php +++ b/resources/views/contest/board/analysis.blade.php @@ -25,26 +25,6 @@ text-decoration: none!important; } - nav-div{ - display: block; - margin-bottom: 0; - border-bottom: 2px solid rgba(0, 0, 0, 0.15); - } - - nav-item{ - display: inline-block; - color: rgba(0, 0, 0, 0.42); - padding: 0.25rem 0.75rem; - font-size: 0.85rem; - } - - nav-item.active{ - color: rgba(0, 0, 0, 0.93); - color: #03a9f4; - border-bottom: 2px solid #03a9f4; - margin-bottom: -2px; - } - h5{ margin-bottom: 1rem; font-weight: bold; @@ -102,19 +82,11 @@
    {{$contest_name}}
    - - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis - @endif - @if($clearance>2) - Admin - @endif - + @include('contest.board.nav',[ + 'nav'=>'analysis', + 'basic'=>$basic, + 'clearance'=>$clearance + ])
    diff --git a/resources/views/contest/board/challenge.blade.php b/resources/views/contest/board/challenge.blade.php index 00a2c165e..4bd15895a 100644 --- a/resources/views/contest/board/challenge.blade.php +++ b/resources/views/contest/board/challenge.blade.php @@ -25,26 +25,6 @@ text-decoration: none!important; } - nav-div{ - display: block; - margin-bottom: 0; - border-bottom: 2px solid rgba(0, 0, 0, 0.15); - } - - nav-item{ - display: inline-block; - color: rgba(0, 0, 0, 0.42); - padding: 0.25rem 0.75rem; - font-size: 0.85rem; - } - - nav-item.active{ - color: rgba(0, 0, 0, 0.93); - color: #03a9f4; - border-bottom: 2px solid #03a9f4; - margin-bottom: -2px; - } - h5{ margin-bottom: 1rem; font-weight: bold; @@ -126,19 +106,11 @@
    {{$contest_name}}
    - - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis - @endif - @if($clearance>2) - Admin - @endif - + @include('contest.board.nav',[ + 'nav'=>'challenge', + 'basic'=>$basic, + 'clearance'=>$clearance + ]) @foreach($problem_set as $p) diff --git a/resources/views/contest/board/clarification.blade.php b/resources/views/contest/board/clarification.blade.php index 46cc7f86f..376222e10 100644 --- a/resources/views/contest/board/clarification.blade.php +++ b/resources/views/contest/board/clarification.blade.php @@ -25,26 +25,6 @@ text-decoration: none!important; } - nav-div{ - display: block; - margin-bottom: 0; - border-bottom: 2px solid rgba(0, 0, 0, 0.15); - } - - nav-item{ - display: inline-block; - color: rgba(0, 0, 0, 0.42); - padding: 0.25rem 0.75rem; - font-size: 0.85rem; - } - - nav-item.active{ - color: rgba(0, 0, 0, 0.93); - color: #03a9f4; - border-bottom: 2px solid #03a9f4; - margin-bottom: -2px; - } - h5{ margin-bottom: 1rem; font-weight: bold; @@ -175,19 +155,11 @@
    {{$contest_name}}
    - - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis - @endif - @if($clearance>2) - Admin - @endif - + @include('contest.board.nav',[ + 'nav'=>'clarification', + 'basic'=>$basic, + 'clearance'=>$clearance + ])
    diff --git a/resources/views/contest/board/nav.blade.php b/resources/views/contest/board/nav.blade.php index 0f8099bec..c5de3afa0 100644 --- a/resources/views/contest/board/nav.blade.php +++ b/resources/views/contest/board/nav.blade.php @@ -24,13 +24,15 @@ } - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis + @if(time() >= strtotime($basic['begin_time'])) + Challenge + Rank + Status + Clarification + Print + @if($basic['practice']) + Analysis + @endif @endif @if($clearance>2) Admin diff --git a/resources/views/contest/board/print.blade.php b/resources/views/contest/board/print.blade.php index 1e9bf95fe..c534d39f8 100644 --- a/resources/views/contest/board/print.blade.php +++ b/resources/views/contest/board/print.blade.php @@ -34,7 +34,11 @@
    {{$contest_name}}
    - @include('contest.board.nav',['nav'=>'print']) + @include('contest.board.nav',[ + 'nav'=>'print', + 'basic'=>$basic, + 'clearance'=>$clearance + ])

    Not Supported

    diff --git a/resources/views/contest/board/rank.blade.php b/resources/views/contest/board/rank.blade.php index e730d9e0a..bad76fce5 100644 --- a/resources/views/contest/board/rank.blade.php +++ b/resources/views/contest/board/rank.blade.php @@ -25,26 +25,6 @@ text-decoration: none!important; } - nav-div{ - display: block; - margin-bottom: 0; - border-bottom: 2px solid rgba(0, 0, 0, 0.15); - } - - nav-item{ - display: inline-block; - color: rgba(0, 0, 0, 0.42); - padding: 0.25rem 0.75rem; - font-size: 0.85rem; - } - - nav-item.active{ - color: rgba(0, 0, 0, 0.93); - color: #03a9f4; - border-bottom: 2px solid #03a9f4; - margin-bottom: -2px; - } - h5{ margin-bottom: 1rem; font-weight: bold; @@ -129,19 +109,11 @@
    {{$contest_name}}
    - - Challenge - Rank - Status - Clarification - Print - @if($basic['practice']) - Analysis - @endif - @if($clearance>2) - Admin - @endif - + @include('contest.board.nav',[ + 'nav'=>'rank', + 'basic'=>$basic, + 'clearance'=>$clearance + ]) @if($rank_frozen)

    {{$dojo->problems->count()}} {{Str::plural('problem', $dojo->problems->count())}}

    -

    {{$dojo->description}}

    +

    {{$dojo->description}}

    @@ -165,7 +165,8 @@

    {{$dojo->name}}

    {{$dojo->description}}

    - +

    You need to complete no less than {{$dojo->passline}} {{Str::plural('problem', $dojo->passline)}} to complete this mission.

    + @foreach($dojo->problems->sortBy('order') as $problem) @php $problem=$problem->problem; @endphp @@ -178,6 +179,11 @@ @endforeach + @if(false) + + @else + + @endif
    @endforeach From 93b5bed0ba7c33598725bf46d320e586dd872b44 Mon Sep 17 00:00:00 2001 From: ZsgsDesign Date: Mon, 23 Sep 2019 11:43:43 +0800 Subject: [PATCH 131/207] add completed feature --- app/Models/Eloquent/Dojo/Dojo.php | 21 +++++++++++++++++++ app/Models/Eloquent/ProblemModel.php | 30 ++++++++++++++++++++++++++++ resources/views/dojo/index.blade.php | 16 ++++++++++----- 3 files changed, 62 insertions(+), 5 deletions(-) diff --git a/app/Models/Eloquent/Dojo/Dojo.php b/app/Models/Eloquent/Dojo/Dojo.php index 5e28db5b7..7a80bdd8d 100644 --- a/app/Models/Eloquent/Dojo/Dojo.php +++ b/app/Models/Eloquent/Dojo/Dojo.php @@ -18,4 +18,25 @@ public function problems() { return $this->hasMany('App\Models\Eloquent\Dojo\DojoProblem', 'dojo_id'); } + + public function canPass() + { + $tot=0; + foreach($this->problems->sortBy('order') as $problem){ + $problem=$problem->problem; + $tot+=$problem->problem_status['color']=='wemd-green-text'; + } + return $tot>=$this->passline; + } + + public function getPassedAttribute() + { + return $this->availability=='passed'; + } + + public function getAvailabilityAttribute() + { + return 'locked'; + } + } diff --git a/app/Models/Eloquent/ProblemModel.php b/app/Models/Eloquent/ProblemModel.php index 3812c33ba..4e5ee4a47 100644 --- a/app/Models/Eloquent/ProblemModel.php +++ b/app/Models/Eloquent/ProblemModel.php @@ -4,6 +4,8 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\DB; +use App\Models\Submission\SubmissionModel as OutdatedSubmissionModel; +use Auth; class ProblemModel extends Model { @@ -12,4 +14,32 @@ class ProblemModel extends Model const DELETED_AT=null; const UPDATED_AT="update_date"; const CREATED_AT=null; + + public function submissions() + { + return $this->hasMany('App\Models\Eloquent\SubmissionModel', 'pid'); + } + + public function getProblemStatusAttribute() + { + if(Auth::check()){ + $prob_status=(new OutdatedSubmissionModel())->getProblemStatus($this->pid, Auth::user()->id); + if (empty($prob_status)) { + return [ + "icon"=>"checkbox-blank-circle-outline", + "color"=>"wemd-grey-text" + ]; + } else { + return [ + "icon"=>$prob_status["verdict"]=="Accepted" ? "checkbox-blank-circle" : "cisco-webex", + "color"=>$prob_status["color"] + ]; + } + } else { + return [ + "icon"=>"checkbox-blank-circle-outline", + "color"=>"wemd-grey-text" + ]; + } + } } diff --git a/resources/views/dojo/index.blade.php b/resources/views/dojo/index.blade.php index 5813fa1ed..29ceebcc6 100644 --- a/resources/views/dojo/index.blade.php +++ b/resources/views/dojo/index.blade.php @@ -43,6 +43,10 @@ height: 8rem; } + dojo-card.locked{ + cursor: auto; + } + dojo-card.passed{ border: 1px solid rgba(139, 195, 74, 0.62); box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px; @@ -149,7 +153,7 @@
    @foreach($phase->dojos->sortBy('order') as $dojo)
    - +
    {{$dojo->name}} 0 passed @@ -171,7 +175,7 @@ @php $problem=$problem->problem; @endphp
    - +

    {{$problem->pcode}}. {{$problem->title}}

    @@ -179,8 +183,10 @@ @endforeach - @if(false) - + @if($dojo->passed) + + @elseif($dojo->canPass()) + @else @endif @@ -194,7 +200,7 @@ +@else +@endguest From b07906c23dc4568db3a448c8a443982619bdef48 Mon Sep 17 00:00:00 2001 From: ZsgsDesign Date: Mon, 23 Sep 2019 13:15:29 +0800 Subject: [PATCH 138/207] add pass count and complete button --- app/Models/Eloquent/Dojo/Dojo.php | 13 ++++++-- resources/views/dojo/index.blade.php | 48 ++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/app/Models/Eloquent/Dojo/Dojo.php b/app/Models/Eloquent/Dojo/Dojo.php index 7a80bdd8d..bfbafd571 100644 --- a/app/Models/Eloquent/Dojo/Dojo.php +++ b/app/Models/Eloquent/Dojo/Dojo.php @@ -19,6 +19,11 @@ public function problems() return $this->hasMany('App\Models\Eloquent\Dojo\DojoProblem', 'dojo_id'); } + public function passes() + { + return $this->hasMany('App\Models\Eloquent\Dojo\DojoPass', 'dojo_id'); + } + public function canPass() { $tot=0; @@ -31,12 +36,16 @@ public function canPass() public function getPassedAttribute() { - return $this->availability=='passed'; + return DojoPass::isPassed($this->id); } public function getAvailabilityAttribute() { - return 'locked'; + foreach(explode(',', $this->precondition) as $dojo_id){ + if(blank($dojo_id)) continue; + if(!DojoPass::isPassed($dojo_id)) return 'locked'; + } + return $this->passed?'passed':'available'; } } diff --git a/resources/views/dojo/index.blade.php b/resources/views/dojo/index.blade.php index 29ceebcc6..72010c437 100644 --- a/resources/views/dojo/index.blade.php +++ b/resources/views/dojo/index.blade.php @@ -156,7 +156,7 @@
    {{$dojo->name}} - 0 passed + {{$dojo->passes->count()}} passed

    {{$dojo->problems->count()}} {{Str::plural('problem', $dojo->problems->count())}}

    @@ -186,7 +186,7 @@ @if($dojo->passed) @elseif($dojo->canPass()) - + @else @endif @@ -200,10 +200,52 @@ diff --git a/resources/views/account/components/avatarUpdate.blade.php b/resources/views/account/components/avatarUpdate.blade.php new file mode 100644 index 000000000..629786d7d --- /dev/null +++ b/resources/views/account/components/avatarUpdate.blade.php @@ -0,0 +1,112 @@ + + diff --git a/resources/views/account/components/feedView.blade.php b/resources/views/account/components/feedView.blade.php new file mode 100644 index 000000000..abbdbc3bd --- /dev/null +++ b/resources/views/account/components/feedView.blade.php @@ -0,0 +1,185 @@ + +{{-- + +

    {{config("app.name")}} Feed is empty, try adding some :-)

    +     --}} +{{-- + +

    Introducing {{config("app.name")}} Feed

    +

    Meet the fully new design of {{config("app.name")}} Feed.

    + +     + + 29 Apr,2019 + Solution, Posts + 35 users + +     --}} +@foreach($feed as $f) + + + + + + +
    {{$info["name"]}} posted a solution to {{$f["pcode"]}}
    +     +     + +

    {{$f["title"]}}

    +

    See more about this solution.

    +     + {{$f["created_at"]}} +     +@endforeach + + + + + + +
    {{$info["name"]}} joined {{config("app.name")}}
    +     +     + {{$info["created_at"]}} +     diff --git a/resources/views/account/components/settingView.blade.php b/resources/views/account/components/settingView.blade.php new file mode 100644 index 000000000..7f835d467 --- /dev/null +++ b/resources/views/account/components/settingView.blade.php @@ -0,0 +1,355 @@ + + + +

    Basic info

    +
    + + +
    +
    + + + max length : 0 / 255 +
    +
    + +
    + +     + +

    Extra info

    +
    +
    + +
    +
    + +
    + MALE + FAMALE + OTHER I WANT + PRIVATE +
    +
    + +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + +
    +     + @if(!$info['contest_account']) + +

    Socialite Account Binding

    +
    + + @if(empty($socialite_info['github'])) + Click to bind + @else + {{$socialite_info['github']['nickname'] ?? $socialite_info['github']['email']}} + @endif + +
    +     + {{-- +

    Style settings

    +     --}} + {{-- +

    Privacy settings

    +     --}} + +

    Email verify

    +
    + @unless(emailVerified()) +

    you have not verified your email, your account security cannot be guaranteed
    You can click the button below to send a confirmation email to your mailbox

    +
    + +
    + + @else +

    + Your email address {{$info['email']}} has been confirmed, and your email will provide extra support in case of security problems of your account. +

    + @endunless +
    +     + @endif + +

    Change password

    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + +     +     + diff --git a/resources/views/account/components/userCard.blade.php b/resources/views/account/components/userCard.blade.php new file mode 100644 index 000000000..48b06c1e4 --- /dev/null +++ b/resources/views/account/components/userCard.blade.php @@ -0,0 +1,224 @@ + + + + + avatar + + +

    {{$info["name"]}}

    + @if($info["admin"])

    Administration Group

    @endif + @unless(is_null($info["professionalTitle"]))

    {{$info["professionalTitle"]}}

    @endunless + @unless(is_null($info["rankTitle"]))

    {{$info["rankTitle"]}}

    @endunless + {{--

    站点管理员

    --}} + {{--

    {{$info["email"]}}

    --}} +

    {{$info['describes']}}

    + @if(!empty($extra_info)) + +
    +

    + @foreach ($extra_info as $key => $value) + {{$key}} : {{$value}}
    + @endforeach +

    +
    + @endif +     +
    + +
    +
    + +

    {{$info["solvedCount"]}}

    +

    Solved

    +     +
    + {{--
    + +

    {{$info["submissionCount"]}}

    +

    Submissions

    +     +
    --}} +
    + +

    {{$info["professional_rate"]}}

    +

    Rated

    +     +
    +
    + +

    {{$info["rank"]}}

    +

    Casu. Rank

    +     +
    +
    + {{--
    +
    + +

    {{$info["professional_rate"]}}

    +

    Rated

    +     +
    +
    + +

    {{$info["submissionCount"]}}

    +

    Prof. Rank

    +     +
    +
    --}} +     +
    + +

    List of solved problems

    + @if(empty($info["solved"])) +
    + Nothing Here +
    + @else +
    + @foreach ($info["solved"] as $prob) + {{$prob["pcode"]}} + @endforeach +
    + @endif +     + + @if(empty($socialite_info['github'])) + + @else + + @endif + + + +     diff --git a/resources/views/account/dashboard.blade.php b/resources/views/account/dashboard.blade.php index e5d234da2..eb22e3e7a 100644 --- a/resources/views/account/dashboard.blade.php +++ b/resources/views/account/dashboard.blade.php @@ -48,86 +48,6 @@ color:rgba(0,0,0,0.54); } - user-card { - display: block; - box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 30px; - border-radius: 4px; - transition: .2s ease-out .0s; - color: #7a8e97; - background: #fff; - position: relative; - /* border: 1px solid rgba(0, 0, 0, 0.15); */ - margin-bottom: 4rem; - padding: 0; - overflow: hidden; - } - - user-card:hover { - box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 40px; - } - - user-card > avatar-section{ - display: block; - position: relative; - text-align: center; - height: 5rem; - user-select: none; - } - - user-card > avatar-section > img{ - display: block; - width: 10rem; - height: 10rem; - border-radius: 2000px; - box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 30px; - border: 1px solid rgba(0, 0, 0, 0.15); - top: -100%; - left: 0; - right: 0; - position: absolute; - margin: 0 auto; - object-fit: cover; - @unless($userView)cursor: pointer;@endunless - } - - #avatar-preview{ - display: inline-block; - width: 10rem; - height: 10rem; - border-radius: 2000px; - box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 30px; - border: 1px solid rgba(0, 0, 0, 0.15); - margin: 2rem 0; - } - - user-card > basic-section, - user-card > statistic-section, - user-card > social-section, - user-card > solved-section, - user-card > control-section { - text-align: center; - padding: 1rem; - display:block; - } - - user-card statistic-block{ - display: block; - font-family: 'Roboto Slab'; - } - - user-card statistic-block p{ - font-size: 0.85rem; - } - - user-card social-section,socialite-setting i{ - font-size: 2rem; - color:#24292e; - } - - user-card social-section i{ - margin: 0 0.5rem; - } - a:hover{ text-decoration: none!important; } @@ -146,195 +66,6 @@ height: 10rem; } - info-badge { - display: inline-block; - padding: 0.25rem 0.75em; - font-weight: 700; - line-height: 1.5; - text-align: center; - vertical-align: baseline; - border-radius: 0.125rem; - background-color: #f5f5f5; - margin: 1rem; - box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 30px; - border-radius: 4px; - transition: .2s ease-out .0s; - color: #7a8e97; - background: #fff; - position: relative; - border: 1px solid rgba(0, 0, 0, 0.15); - } - - prob-badge{ - display: inline-block; - margin-bottom: 0; - font-weight: 400; - text-align: center; - vertical-align: middle; - -ms-touch-action: manipulation; - touch-action: manipulation; - cursor: pointer; - background-image: none; - border: 1px solid transparent; - white-space: nowrap; - line-height: 1.5; - user-select: none; - padding: 6px 15px; - font-size: 12px; - border-radius: 4px; - transition: color .2s linear,background-color .2s linear,border .2s linear,box-shadow .2s linear; - color: #495060; - background-color: transparent; - border-color: #dddee1; - margin: 0.25rem; - } - - prob-badge:hover{ - color: #57a3f3; - background-color: transparent; - border-color: #57a3f3; - } - - feed-card[feed-type="event"]{ - display: block; - margin-bottom: 2rem; - } - - feed-card[feed-type="event"] > feed-header{ - display: flex; - align-items: center; - } - - feed-card[feed-type="event"] > feed-header > feed-circle{ - display: flex; - height:3rem; - width:3rem; - border-radius: 2000px; - overflow: hidden; - margin-right: 1rem; - align-items: center; - justify-content: center; - } - - feed-card[feed-type="event"] > feed-header > feed-circle > i{ - color:#fff; - font-size: 1.5rem; - } - - feed-card[feed-type="event"] > feed-header > feed-circle > img{ - object-fit: cover; - width:100%; - height:100%; - } - - feed-card[feed-type="event"] > feed-header > feed-info{ - color:rgba(0,0,0,0.42); - } - - feed-card[feed-type="event"] > feed-header > feed-info > h5{ - font-size: 1.2rem; - margin-bottom: 0.5rem; - } - - feed-card[feed-type="event"] > feed-header > feed-info > p{ - font-size: 0.9rem; - margin-bottom: 0; - } - - feed-card[feed-type="event"] > feed-body{ - margin-left: 4rem; - display: block; - /* box-shadow: rgba(0, 0, 0, 0.05) 0px 0px 10px; */ - border-radius: 4px; - transition: .2s ease-out .0s; - color:rgba(0,0,0,0.92); - background: #fff; - padding: 1rem; - position: relative; - border: 1px solid rgba(0, 0, 0, 0.15); - overflow: hidden; - margin-bottom: 1rem; - cursor: pointer; - } - - feed-card[feed-type="event"] > feed-body:hover { - box-shadow: rgba(0, 0, 0, 0.05) 0px 0px 10px; - } - - feed-card[feed-type="event"] > feed-body h1 { - font-size: 1.5rem; - } - - feed-card[feed-type="event"] > feed-body p { - font-size: 1rem; - margin-bottom: 0; - color:rgba(0,0,0,0.54); - } - - feed-card[feed-type="event"] > feed-footer { - margin-left: 4rem; - display: block; - color:rgba(0,0,0,0.42); - font-size: 0.8rem; - } - - feed-card[feed-type="card"] { - display: block; - box-shadow: rgba(0, 0, 0, 0.05) 0px 0px 10px; - border-radius: 4px; - transition: .2s ease-out .0s; - color: #7a8e97; - background: #fff; - /* padding: 1rem; */ - position: relative; - border: 1px solid rgba(0, 0, 0, 0.15); - margin-bottom: 2rem; - overflow: hidden; - } - - feed-card[feed-type="card"]:hover { - box-shadow: rgba(0, 0, 0, 0.15) 0px 0px 40px; - } - - feed-card[feed-type="card"] > feed-footer{ - display: block; - padding: 2rem 4rem; - background-color: #f7f7f7; - line-height: 1.5; - } - - feed-card[feed-type="card"] > feed-footer > info-section{ - display: inline-block; - padding-left:1rem; - padding-right:1rem; - } - - feed-card[feed-type="card"] > feed-footer > info-section:first-of-type{ - padding-left: 0; - } - - feed-card[feed-type="card"] > feed-footer > info-section:last-of-type{ - padding-right: 0; - } - - feed-card[feed-type="card"] > feed-body{ - display: block; - padding: 4rem; - } - - feed-card[feed-type="card"] > feed-body > a{ - margin-top: 1rem; - display: inline-block; - } - - feed-card[feed-type="card"] > feed-body > h1{ - color: #333; - } - - feed-card[feed-type="card"] > feed-body > p{ - margin:0; - } - #basic-info-table td{ border: none; } @@ -342,622 +73,25 @@ .form-control:disabled{ background-color: transparent; } - - account-bind{ - cursor: pointer; - transition: background-color 400ms; - padding: 0 2rem; - } - - account-bind span{ - text-indent: 1rem; - vertical-align: text-bottom; - display: inline-block; - height: 2rem; - line-height: 2rem; - padding-top: 0.05rem - } - - account-bind:hover{ - background-color: #eee; - } - - setting-card > .paper-card { - box-shadow: none; - } - - setting-card > .paper-card:hover { - box-shadow: rgba(0, 0, 0, 0.1) 0px 0px 10px; - }
    - - - - avatar - - -

    {{$info["name"]}}

    - @if($info["admin"])

    Administration Group

    @endif - @unless(is_null($info["professionalTitle"]))

    {{$info["professionalTitle"]}}

    @endunless - @unless(is_null($info["rankTitle"]))

    {{$info["rankTitle"]}}

    @endunless - {{--

    站点管理员

    --}} - {{--

    {{$info["email"]}}

    --}} -

    {{$info['describes']}}

    - @if(!empty($extra_info)) - -
    -

    - @foreach ($extra_info as $key => $value) - {{$key}} : {{$value}}
    - @endforeach -

    -
    - @endif -     -
    - -
    -
    - -

    {{$info["solvedCount"]}}

    -

    Solved

    -     -
    - {{--
    - -

    {{$info["submissionCount"]}}

    -

    Submissions

    -     -
    --}} -
    - -

    {{$info["professional_rate"]}}

    -

    Rated

    -     -
    -
    - -

    {{$info["rank"]}}

    -

    Casu. Rank

    -     -
    -
    - {{--
    -
    - -

    {{$info["professional_rate"]}}

    -

    Rated

    -     -
    -
    - -

    {{$info["submissionCount"]}}

    -

    Prof. Rank

    -     -
    -
    --}} -     -
    - -

    List of solved problems

    - @if(empty($info["solved"])) -
    - Nothing Here -
    - @else -
    - @foreach ($info["solved"] as $prob) - {{$prob["pcode"]}} - @endforeach -
    - @endif -     - - @if(empty($socialite_info['github'])) - - @else - - @endif - - - -     + @if($userView) + @include('account.components.abuseButton') + @endif + @include('account.components.userCard') + @if(!$userView) + @include('account.components.avatarUpdate') + @endif
    @if(!$settingsView) - {{-- - -

    {{config("app.name")}} Feed is empty, try adding some :-)

    -     --}} - {{-- - -

    Introducing {{config("app.name")}} Feed

    -

    Meet the fully new design of {{config("app.name")}} Feed.

    - -     - - 29 Apr,2019 - Solution, Posts - 35 users - -     --}} - @foreach($feed as $f) - - - - - - -
    {{$info["name"]}} posted a solution to {{$f["pcode"]}}
    -     -     - -

    {{$f["title"]}}

    -

    See more about this solution.

    -     - {{$f["created_at"]}} -     - @endforeach - - - - - - -
    {{$info["name"]}} joined {{config("app.name")}}
    -     -     - {{$info["created_at"]}} -     + @include('account.components.feedView') @else - - -

    Basic info

    -
    - - -
    -
    - - - max length : 0 / 255 -
    -
    - -
    - -     - -

    Extra info

    -
    -
    - -
    -
    - -
    - MALE - FAMALE - OTHER I WANT - PRIVATE -
    -
    - -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    - -
    -     - @if(!$info['contest_account']) - -

    Socialite Account Binding

    -
    - - @if(empty($socialite_info['github'])) - Click to bind - @else - {{$socialite_info['github']['nickname'] ?? $socialite_info['github']['email']}} - @endif - -
    -     - {{-- -

    Style settings

    -     --}} - {{-- -

    Privacy settings

    -     --}} - -

    Email verify

    -
    - @unless(emailVerified()) -

    you have not verified your email, your account security cannot be guaranteed
    You can click the button below to send a confirmation email to your mailbox

    -
    - -
    - - @else -

    - Your email address {{$info['email']}} has been confirmed, and your email will provide extra support in case of security problems of your account. -

    - @endunless -
    -     - @endif - -

    Change password

    -
    - - -
    -
    - - -
    -
    - - -
    -
    - -
    - -     -     + @include('account.components.settingView') @endif
    -
    - @endsection From aaa81985f9d5fc0cf5a703db493186f10c57d249 Mon Sep 17 00:00:00 2001 From: John Zhang Date: Sat, 18 Jan 2020 15:50:40 +0800 Subject: [PATCH 186/207] Add package import --- app/Http/Controllers/Contest/AdminController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/Contest/AdminController.php b/app/Http/Controllers/Contest/AdminController.php index e3b12a2f5..23c311527 100644 --- a/app/Http/Controllers/Contest/AdminController.php +++ b/app/Http/Controllers/Contest/AdminController.php @@ -9,6 +9,8 @@ use Imtigger\LaravelJobStatus\JobStatus; use Auth; use Redirect; +use App\Exports\AccountExport; +use App\Models\Eloquent\ContestModel as EloquentContestModel; use Excel; use Cache; use DB; From c53041b6d4d76d83951e291e06b07efd3f6100f9 Mon Sep 17 00:00:00 2001 From: John Zhang Date: Sat, 18 Jan 2020 15:53:15 +0800 Subject: [PATCH 187/207] Add pid for submissions --- app/Models/Eloquent/ProblemModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Eloquent/ProblemModel.php b/app/Models/Eloquent/ProblemModel.php index 4e5ee4a47..0bab8fb90 100644 --- a/app/Models/Eloquent/ProblemModel.php +++ b/app/Models/Eloquent/ProblemModel.php @@ -17,7 +17,7 @@ class ProblemModel extends Model public function submissions() { - return $this->hasMany('App\Models\Eloquent\SubmissionModel', 'pid'); + return $this->hasMany('App\Models\Eloquent\SubmissionModel','pid','pid'); } public function getProblemStatusAttribute() From 93fc7ffb358e14c1805e8002edf71d0300e8a520 Mon Sep 17 00:00:00 2001 From: John Zhang Date: Sat, 18 Jan 2020 15:55:11 +0800 Subject: [PATCH 188/207] remove line --- app/Models/Eloquent/ProblemModel.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Models/Eloquent/ProblemModel.php b/app/Models/Eloquent/ProblemModel.php index 0bab8fb90..dbc52da63 100644 --- a/app/Models/Eloquent/ProblemModel.php +++ b/app/Models/Eloquent/ProblemModel.php @@ -19,7 +19,6 @@ public function submissions() { return $this->hasMany('App\Models\Eloquent\SubmissionModel','pid','pid'); } - public function getProblemStatusAttribute() { if(Auth::check()){ From ba344cc95513196dae4c46bf48e0fcfccc295f70 Mon Sep 17 00:00:00 2001 From: John Zhang Date: Sat, 18 Jan 2020 15:58:21 +0800 Subject: [PATCH 189/207] add formatProblemSolvedTime --- app/Helpers/functions.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/Helpers/functions.php b/app/Helpers/functions.php index 72c18158b..240b44165 100644 --- a/app/Helpers/functions.php +++ b/app/Helpers/functions.php @@ -188,6 +188,20 @@ function formatHumanReadableTime($date) } } +if (!function_exists('formatProblemSolvedTime')) { + function formatProblemSolvedTime($seconds) + { + if ($seconds>3600) { + $hours=intval($seconds / 3600); + $minutes=$seconds % 3600; + $time=$hours.":".gmstrftime('%M:%S', $minutes); + } else { + $time=gmstrftime('%H:%M:%S', $seconds); + } + return $time; + } +} + if (!function_exists('latex2Image')) { function latex2Image($content) { From e57dcbf995c7a4d98864ab3d0de556dd46663f1e Mon Sep 17 00:00:00 2001 From: X3ZvaWQ Date: Sat, 18 Jan 2020 16:01:37 +0800 Subject: [PATCH 190/207] add: user abuse report and process --- app/Admin/Controllers/AbuseController.php | 97 ++++++++++++------- app/Http/Controllers/AccountController.php | 2 +- app/Http/Controllers/Ajax/AbuseController.php | 4 + app/Http/Kernel.php | 3 +- app/Http/Middleware/Group/Banned.php | 4 +- app/Http/Middleware/User/Banned.php | 46 +++++++++ app/Models/AccountModel.php | 1 + app/Models/Eloquent/Abuse.php | 4 +- app/Models/Eloquent/UserBanned.php | 21 ++++ app/Models/Eloquent/UserModel.php | 4 + app/User.php | 4 + ...01_17_141017_create_user_banneds_table.php | 36 +++++++ .../account/components/abuseButton.blade.php | 6 +- resources/views/errors/451.blade.php | 6 ++ routes/web.php | 83 ++++++++-------- 15 files changed, 234 insertions(+), 87 deletions(-) create mode 100644 app/Http/Middleware/User/Banned.php create mode 100644 app/Models/Eloquent/UserBanned.php create mode 100644 database/migrations/2020_01_17_141017_create_user_banneds_table.php create mode 100644 resources/views/errors/451.blade.php diff --git a/app/Admin/Controllers/AbuseController.php b/app/Admin/Controllers/AbuseController.php index 483aa0e8c..ea66d8e4d 100644 --- a/app/Admin/Controllers/AbuseController.php +++ b/app/Admin/Controllers/AbuseController.php @@ -2,9 +2,11 @@ namespace App\Admin\Controllers; +use App\User; use App\Models\Eloquent\Abuse; use App\Models\Eloquent\Group; use App\Models\Eloquent\GroupBanned; +use App\Models\Eloquent\UserBanned; use Encore\Admin\Controllers\AdminController; use Encore\Admin\Controllers\HasResourceActions; use Encore\Admin\Form; @@ -92,46 +94,67 @@ protected function form() $form->saving(function (Form $form) { $abuse = $form->model(); - $regex = '/^Group #(\d+)/'; + //get gategory and subject id + $regex = '/^([A-Za-z]+) #(\d+)/'; $matches = []; preg_match($regex,$abuse->title,$matches); - $gid = (int) $matches[1]; - $group = Group::find($gid); - if(empty($group)) { - return ; - } - if($form->audit) { - $ban_time = request()->created_at; - sendMessage([ - 'sender' => 1, - 'receiver' => $abuse->user_id, - 'title' => "Your abuse report about group {$group->name} was passed", - 'content' => "Hi, Dear **{$abuse->user->name}**,\n\nWe have checked your Abuse report about group **[{$group->name}]({$group->link})**.\n\n We think you're right.\n\n So as the consequence leading to a temporary/permanent sanction against the group.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ" - ]); - sendMessage([ - 'sender' => 1, - 'receiver' => $group->leader->id, - 'title' => "Your group {$group->name} has been banned.", - 'content' => "Hi, Dear **{$group->leader->name}**,\n\n For the following reasons: \n\n {$abuse->supplement}\n\n your group **[{$group->name}]({$group->link})** is currently banned and will continue until {$ban_time}.\n\n Before this, only you can enter the group. \n\n Please rectify before this, or you may be subjected to more serious treatment.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ" - ]); - $abuse->delete(); - GroupBanned::create([ - 'abuse_id' => $abuse->id, - 'group_id' => $group->gid, - 'reason' => $abuse->supplement, - 'removed_at' => $ban_time - ]); - return ; - }else{ - sendMessage([ - 'sender' => 1, - 'receiver' => $abuse->user_id, - 'title' => "Your abuse report about group {$group->name} was rejected", - 'content' => "Hi, Dear **{$abuse->user->name}**,\n\n We have checked your Abuse report about group **[{$group->name}]({$group->link})**.\n\n However, we regret to say that the information you submitted is not sufficient for us to take action.\n\n Of course, we will continue to follow up the investigation.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ" - ]); - $abuse->delete(); - return ; + $category = array_search(strtolower($matches[1]),Abuse::$supportCategory); + $subject_id = (int)$matches[2]; + switch($abuse->category) { + case 0: + $gid = $subject_id; + $group = Group::find($gid); + if(empty($group)) { + return ; + } + if($form->audit) { + $ban_time = request()->created_at; + sendMessage([ + 'sender' => 1, + 'receiver' => $abuse->user_id, + 'title' => "Your abuse report about group {$group->name} was passed", + 'content' => "Hi, Dear **{$abuse->user->name}**,\n\nWe have checked your Abuse report about group **[{$group->name}]({$group->link})**.\n\n We think you're right.\n\n So as the consequence leading to a temporary/permanent sanction against the group.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ" + ]); + sendMessage([ + 'sender' => 1, + 'receiver' => $group->leader->id, + 'title' => "Your group {$group->name} has been banned.", + 'content' => "Hi, Dear **{$group->leader->name}**,\n\n For the following reasons: \n\n {$abuse->supplement}\n\n your group **[{$group->name}]({$group->link})** is currently banned and will continue until {$ban_time}.\n\n Before this, only you can enter the group. \n\n Please rectify before this, or you may be subjected to more serious treatment.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ" + ]); + $abuse->delete(); + GroupBanned::create([ + 'abuse_id' => $abuse->id, + 'group_id' => $group->gid, + 'reason' => $abuse->supplement, + 'removed_at' => $ban_time + ]); + return ; + }else{ + sendMessage([ + 'sender' => 1, + 'receiver' => $abuse->user_id, + 'title' => "Your abuse report about group {$group->name} was rejected", + 'content' => "Hi, Dear **{$abuse->user->name}**,\n\n We have checked your Abuse report about group **[{$group->name}]({$group->link})**.\n\n However, we regret to say that the information you submitted is not sufficient for us to take action.\n\n Of course, we will continue to follow up the investigation.\n\n Thank you for your contribution to our community environment.\n\n Sincerely, NOJ" + ]); + $abuse->delete(); + return ; + } + return; + case 1: + $ban_time = request()->created_at; + UserBanned::create([ + 'abuse_id' => $abuse->id, + 'user_id' => $subject_id, + 'reason' => $abuse->supplement, + 'removed_at' => $ban_time + ]); + $abuse->delete(); + return; + default: + return; } + + }); return $form; diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index b26c299b2..10d142a20 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -15,7 +15,7 @@ class AccountController extends Controller */ public function index() { - return Auth::check() ? redirect("/account/dashboard") : redirect("/login"); + return response()->redirectTo("/account/dashboard"); } /** diff --git a/app/Http/Controllers/Ajax/AbuseController.php b/app/Http/Controllers/Ajax/AbuseController.php index 45f5abdb4..702aa8299 100644 --- a/app/Http/Controllers/Ajax/AbuseController.php +++ b/app/Http/Controllers/Ajax/AbuseController.php @@ -37,6 +37,9 @@ public function report(Request $request) 'group'=>function($id){ return route('group.detail',['gcode'=>Group::findOrFail($id)->gcode]); }, + 'user'=>function($id){ + return route('user.view',['uid' => $id]); + } ]; $supplement = $request->input('supplement'); $category = $request->input('category'); @@ -50,6 +53,7 @@ public function report(Request $request) [$causeID, $causeDesc] = self::findCause('General'); $abuseRecord = Abuse::create([ 'title' => Str::title($category)." #$subject_id Abused - $causeDesc", + 'category' => array_search($category, Abuse::$supportCategory), 'cause' => $causeID, 'supplement' => $supplement, 'link' => $link, diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index f00c99caa..5bc3a68e8 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -63,7 +63,8 @@ class Kernel extends HttpKernel 'contest_account' => \App\Http\Middleware\ContestAccount::class, 'privileged' => \App\Http\Middleware\Privileged::class, 'group.exist' => \App\Http\Middleware\Group\Exists::class, - 'group.banned' => \App\Http\Middleware\Group\Banned::class + 'group.banned' => \App\Http\Middleware\Group\Banned::class, + 'user.banned' => \App\Http\Middleware\User\Banned::class, ]; /** diff --git a/app/Http/Middleware/Group/Banned.php b/app/Http/Middleware/Group/Banned.php index dd902dde3..89ca20d24 100644 --- a/app/Http/Middleware/Group/Banned.php +++ b/app/Http/Middleware/Group/Banned.php @@ -22,7 +22,9 @@ public function handle($request, Closure $next) $banneds = $group->banneds()->where('removed_at','>',date('Y-m-d H:i:s'))->first(); $user = Auth::user(); if(!empty($banneds) && $user->id != $group->leader->id) { - return redirect('/group'); + return response()->view('errors.451',[ + 'description' => 'This group is currently banned. Please contact the group administrator.' + ]); } return $next($request); } diff --git a/app/Http/Middleware/User/Banned.php b/app/Http/Middleware/User/Banned.php new file mode 100644 index 000000000..26d213584 --- /dev/null +++ b/app/Http/Middleware/User/Banned.php @@ -0,0 +1,46 @@ +banneds()->orderBy('removed_at', 'desc')->first(); + //check if there are any banned records + if(empty($banned)) { + return $next($request); + } + //check the time of the last record + if(strtotime($banned->removed_at) <= time()){ + return $next($request); + } + //return error page + if($request->method() == 'GET'){ + return response()->view('errors.451',[ + 'description' => "Your account is currently blocked and will remain so until {$banned->removed_at}. Here's why: {$banned->reason}", + ]); + }else{ + return response()->json([ + 'ret' => 451, + 'desc' => 'Unavailable For Legal Reasons', + 'data' => "Your account is currently blocked and will remain so until {$banned->removed_at}. Here's why: {$banned->reason}" + ]); + } + } +} diff --git a/app/Models/AccountModel.php b/app/Models/AccountModel.php index e100d8ba5..8b264a748 100644 --- a/app/Models/AccountModel.php +++ b/app/Models/AccountModel.php @@ -109,6 +109,7 @@ public function add($data) public function detail($uid) { $ret=DB::table("users")->where(["id"=>$uid])->first(); + $ret["uid"]=$uid; $ret["submissionCount"]=DB::table("submission")->where([ "uid"=>$uid, ])->whereNotIn('verdict', [ diff --git a/app/Models/Eloquent/Abuse.php b/app/Models/Eloquent/Abuse.php index 958b76105..e23aec1a7 100644 --- a/app/Models/Eloquent/Abuse.php +++ b/app/Models/Eloquent/Abuse.php @@ -9,13 +9,13 @@ class Abuse extends Model { use SoftDeletes; - public static $supportCategory=['group']; + public static $supportCategory=['group', 'user']; public static $cause=[ '0'=>'General' ]; protected $fillable=[ - 'title', 'cause', 'supplement', 'link', 'user_id' + 'title', 'category', 'cause', 'supplement', 'link', 'user_id' ]; public function user() diff --git a/app/Models/Eloquent/UserBanned.php b/app/Models/Eloquent/UserBanned.php new file mode 100644 index 000000000..e4d5a362d --- /dev/null +++ b/app/Models/Eloquent/UserBanned.php @@ -0,0 +1,21 @@ +belongsTo('\App\Models\Eloquent\Abuse'); + } + + public function user() { + return $this->belongsTo('\App\User'); + } +} diff --git a/app/Models/Eloquent/UserModel.php b/app/Models/Eloquent/UserModel.php index 85d292217..5d09d44c0 100644 --- a/app/Models/Eloquent/UserModel.php +++ b/app/Models/Eloquent/UserModel.php @@ -25,4 +25,8 @@ class UserModel extends Model protected $hidden=[ 'password', 'remember_token', ]; + + public function banneds() { + return $this->hasMany('App\Models\Eloquent\UserBanned'); + } } diff --git a/app/User.php b/app/User.php index 8e7289eac..7f8aecf52 100644 --- a/app/User.php +++ b/app/User.php @@ -27,4 +27,8 @@ class User extends Authenticatable protected $hidden=[ 'password', 'remember_token', ]; + + public function banneds() { + return $this->hasMany('App\Models\Eloquent\UserBanned'); + } } diff --git a/database/migrations/2020_01_17_141017_create_user_banneds_table.php b/database/migrations/2020_01_17_141017_create_user_banneds_table.php new file mode 100644 index 000000000..b0b88d787 --- /dev/null +++ b/database/migrations/2020_01_17_141017_create_user_banneds_table.php @@ -0,0 +1,36 @@ +integer('id',true); + $table->integer('user_id'); + $table->integer('abuse_id')->nullable(); + $table->string('reason')->nullable(); + $table->timestamp('removed_at')->nullable(); + $table->timestamps(); + $table->softDeletes(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('user_banneds'); + } +} diff --git a/resources/views/account/components/abuseButton.blade.php b/resources/views/account/components/abuseButton.blade.php index 4c8646017..0214ad398 100644 --- a/resources/views/account/components/abuseButton.blade.php +++ b/resources/views/account/components/abuseButton.blade.php @@ -39,6 +39,8 @@
    - +@include("js.common.abuse",[ + 'category' => 'user', + 'subject_id' => $info["uid"] +]) diff --git a/resources/views/errors/451.blade.php b/resources/views/errors/451.blade.php new file mode 100644 index 000000000..ad9d641ed --- /dev/null +++ b/resources/views/errors/451.blade.php @@ -0,0 +1,6 @@ +@include('errors.general',[ + 'emoji'=>':-(', + 'code'=>451, + 'type'=>$type ?? 'Unavailable For Legal Reasons', + 'description'=>$description ?? 'Access to this resource on the server is denied!' +]) diff --git a/routes/web.php b/routes/web.php index 10757fe46..ab04159c3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -13,6 +13,7 @@ use App\Models\Eloquent\Group; + Route::redirect('/home', '/', 301); Route::redirect('/acmhome/welcome.do', '/', 301); Route::get('/acmhome/problemdetail.do','MainController@oldRedirect')->name('old.redirect'); @@ -24,27 +25,22 @@ Route::get('/latex.png','LatexController@png')->name('png'); }); -/* Route::get('/', function() { - $g = Group::find(3); - dd($g->leader->user); -}); - */ Route::get('/', 'MainController@home')->middleware('contest_account')->name('home'); Route::get('/search', 'SearchController')->middleware('auth')->name('search'); -Route::group(['prefix' => 'message','as' => 'message.'], function () { - Route::get('/', 'MessageController@index')->middleware('auth')->name('index'); - Route::get('/{id}', 'MessageController@detail')->middleware('auth')->name('detail'); +Route::group(['prefix' => 'message','as' => 'message.','middleware' => ['user.banned','auth']], function () { + Route::get('/', 'MessageController@index')->name('index'); + Route::get('/{id}', 'MessageController@detail')->name('detail'); }); -Route::group(['prefix' => 'account'], function () { +Route::group(['prefix' => 'account','middleware' => ['user.banned','auth']], function () { Route::get('/', 'AccountController@index')->name('account_index'); - Route::get('/dashboard', 'AccountController@dashboard')->middleware('auth')->name('account_dashboard'); - Route::get('/settings', 'AccountController@settings')->middleware('auth')->name('account_settings'); + Route::get('/dashboard', 'AccountController@dashboard')->name('account_dashboard'); + Route::get('/settings', 'AccountController@settings')->name('account_settings'); }); -Route::group(['prefix' => 'oauth', 'namespace' => 'OAuth', 'as' => 'oauth.'], function () { +Route::group(['prefix' => 'oauth', 'namespace' => 'OAuth', 'as' => 'oauth.', 'middleware' => ['user.banned','auth']], function () { Route::group(['prefix' => 'github', 'as' => 'github.'], function () { Route::get('/', 'GithubController@redirectTo')->name('index'); Route::get('/unbind','GithubController@unbind')->name('unbind'); @@ -53,42 +49,42 @@ }); }); -Route::group(['prefix' => 'user','as' => 'user.'], function () { +Route::group(['prefix' => 'user','as' => 'user.', 'middleware' => ['user.banned','auth','contest_account']], function () { Route::redirect('/', '/', 301); - Route::get('/{uid}', 'UserController@view')->middleware('contest_account')->name('view'); + Route::get('/{uid}', 'UserController@view')->name('view'); }); -Route::group(['prefix' => 'problem'], function () { - Route::get('/', 'ProblemController@index')->middleware('contest_account')->name('problem_index'); - Route::get('/{pcode}', 'ProblemController@detail')->middleware('contest_account')->name('problem.detail'); - Route::get('/{pcode}/editor', 'ProblemController@editor')->middleware('auth', 'contest_account')->name('problem_editor'); - Route::get('/{pcode}/solution', 'ProblemController@solution')->middleware('auth', 'contest_account')->name('problem_solution'); - Route::get('/{pcode}/discussion', 'ProblemController@discussion')->middleware('auth', 'contest_account')->name('problem.discussion'); +Route::group(['prefix' => 'problem', 'middleware' => ['user.banned', 'contest_account']], function () { + Route::get('/', 'ProblemController@index')->name('problem_index'); + Route::get('/{pcode}', 'ProblemController@detail')->name('problem.detail'); + Route::get('/{pcode}/editor', 'ProblemController@editor')->middleware('auth')->name('problem_editor'); + Route::get('/{pcode}/solution', 'ProblemController@solution')->middleware('auth')->name('problem_solution'); + Route::get('/{pcode}/discussion', 'ProblemController@discussion')->middleware('auth')->name('problem.discussion'); }); -Route::get('/discussion/{dcode}', 'ProblemController@discussionPost')->middleware('auth', 'contest_account')->name('problem.discussion.post'); +Route::get('/discussion/{dcode}', 'ProblemController@discussionPost')->middleware('auth', 'contest_account', 'user.banned')->name('problem.discussion.post'); -Route::get('/status', 'StatusController@index')->middleware('contest_account')->name('status_index'); +Route::get('/status', 'StatusController@index')->middleware('contest_account', 'user.banned')->name('status_index'); -Route::group(['prefix' => 'dojo','as' => 'dojo.'], function () { - Route::get('/', 'DojoController@index')->middleware('contest_account')->name('index'); +Route::group(['prefix' => 'dojo','as' => 'dojo.','middleware' => ['user.banned', 'contest_account']], function () { + Route::get('/', 'DojoController@index')->name('index'); }); -Route::group(['namespace' => 'Group', 'prefix' => 'group','as' => 'group.'], function () { - Route::get('/', 'IndexController@index')->middleware('contest_account')->name('index'); - Route::get('/create', 'IndexController@create')->middleware('contest_account')->name('create'); - Route::get('/{gcode}', 'IndexController@detail')->middleware('auth', 'contest_account', 'group.exist', 'group.banned')->name('detail'); +Route::group(['namespace' => 'Group', 'prefix' => 'group','as' => 'group.','middleware' => ['contest_account', 'user.banned']], function () { + Route::get('/', 'IndexController@index')->name('index'); + Route::get('/create', 'IndexController@create')->name('create'); + Route::get('/{gcode}', 'IndexController@detail')->middleware('auth', 'group.exist', 'group.banned')->name('detail'); - Route::get('/{gcode}/analysis', 'IndexController@analysis')->middleware('auth', 'contest_account', 'group.exist', 'group.banned')->name('analysis'); - Route::get('/{gcode}/analysisDownload', 'IndexController@analysisDownload')->middleware('auth', 'contest_account', 'group.exist', 'group.banned')->name('analysis.download'); + Route::get('/{gcode}/analysis', 'IndexController@analysis')->middleware('auth', 'group.exist', 'group.banned')->name('analysis'); + Route::get('/{gcode}/analysisDownload', 'IndexController@analysisDownload')->middleware('auth', 'group.exist', 'group.banned')->name('analysis.download'); Route::group(['prefix' => '{gcode}/settings','as' => 'settings.', 'middleware' => ['privileged', 'group.exist', 'group.banned']], function () { - Route::get('/', 'AdminController@settings')->middleware('auth', 'contest_account')->name('index'); - Route::get('/general', 'AdminController@settingsGeneral')->middleware('auth', 'contest_account')->name('general'); - Route::get('/return', 'AdminController@settingsReturn')->middleware('auth', 'contest_account')->name('return'); - Route::get('/danger', 'AdminController@settingsDanger')->middleware('auth', 'contest_account')->name('danger'); - Route::get('/member', 'AdminController@settingsMember')->middleware('auth', 'contest_account')->name('member'); - Route::get('/contest', 'AdminController@settingsContest')->middleware('auth', 'contest_account')->name('contest'); - Route::get('/problems', 'AdminController@problems')->middleware('auth', 'contest_account')->name('problems'); + Route::get('/', 'AdminController@settings')->middleware('auth')->name('index'); + Route::get('/general', 'AdminController@settingsGeneral')->middleware('auth')->name('general'); + Route::get('/return', 'AdminController@settingsReturn')->middleware('auth')->name('return'); + Route::get('/danger', 'AdminController@settingsDanger')->middleware('auth')->name('danger'); + Route::get('/member', 'AdminController@settingsMember')->middleware('auth')->name('member'); + Route::get('/contest', 'AdminController@settingsContest')->middleware('auth')->name('contest'); + Route::get('/problems', 'AdminController@problems')->middleware('auth')->name('problems'); }); }); @@ -97,7 +93,8 @@ 'prefix' => 'contest', 'as' => 'contest.', 'middleware' => [ - 'contest_account' + 'contest_account', + 'user.banned' ] ], function () { Route::get('/', 'IndexController@index')->name('index'); @@ -118,21 +115,21 @@ Route::get('/{cid}/admin/refreshContestRank', 'AdminController@refreshContestRank')->middleware('auth')->name('refreshContestRank'); }); -Route::group(['prefix' => 'system'], function () { +Route::group(['prefix' => 'system', 'middleware' => ['user.banned']], function () { Route::redirect('/', '/system/info', 301); Route::get('/info', 'SystemController@info')->name('system_info'); }); -Route::group(['prefix' => 'rank'], function () { +Route::group(['prefix' => 'rank', 'middleware' => ['user.banned']], function () { Route::get('/', 'RankController@index')->middleware('contest_account')->name('rank_index'); }); -Route::group(['prefix' => 'term'], function () { +Route::group(['prefix' => 'term', 'middleware' => ['user.banned']], function () { Route::redirect('/', '/term/user', 301); Route::get('/user', 'TermController@user')->name('term.user'); }); -Route::group(['namespace' => 'Tool', 'middleware' => ['contest_account']], function () { +Route::group(['namespace' => 'Tool', 'middleware' => ['contest_account', 'user.banned']], function () { Route::group(['prefix' => 'tool'], function () { Route::redirect('/', '/', 301); Route::group(['prefix' => 'pastebin'], function () { @@ -149,7 +146,7 @@ Route::get('/pb/{code}', 'PastebinController@view')->name('tool_pastebin_view_shortlink'); }); -Route::group(['prefix' => 'ajax', 'namespace' => 'Ajax'], function () { +Route::group(['prefix' => 'ajax', 'namespace' => 'Ajax', 'middleware' => ['user.banned']], function () { Route::post('submitSolution', 'ProblemController@submitSolution')->middleware('auth', 'throttle:1,0.17'); Route::post('resubmitSolution', 'ProblemController@resubmitSolution')->middleware('auth', 'throttle:1,0.17'); Route::post('judgeStatus', 'ProblemController@judgeStatus')->middleware('auth'); From d40efe25006dc02c1ea41c3a725868a9e90372a6 Mon Sep 17 00:00:00 2001 From: X3ZvaWQ Date: Sat, 18 Jan 2020 16:26:59 +0800 Subject: [PATCH 191/207] add: ban user command --- app/Console/Commands/Manage/BanUser.php | 63 +++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 app/Console/Commands/Manage/BanUser.php diff --git a/app/Console/Commands/Manage/BanUser.php b/app/Console/Commands/Manage/BanUser.php new file mode 100644 index 000000000..61c097dc1 --- /dev/null +++ b/app/Console/Commands/Manage/BanUser.php @@ -0,0 +1,63 @@ +option('uid'); + $reason=$this->option('reason'); + $time=$this->option('time'); + $user = User::find($uid); + if(empty($user)) { + $this->line("\n Exception : User Not Found\n"); + return; + } + try{ + $ban_time = date('Y-m-d H:i:s',strtotime($time)); + UserBanned::create([ + 'user_id' => $user->id, + 'reason' => $reason, + 'removed_at' => $ban_time + ]); + $this->line("The user {$user->name} will be banned until {$ban_time}"); + }catch(Throwable $e){ + $this->line("\n Exception : Wrong Time.\n"); + return; + } + } +} From 8d7f2e02bcad5edc748c5758221683bb2bb2de2b Mon Sep 17 00:00:00 2001 From: X3ZvaWQ Date: Sat, 18 Jan 2020 17:15:01 +0800 Subject: [PATCH 192/207] fix: change admin portal abuses position --- app/Admin/Controllers/ProblemController.php | 3 ++ app/Admin/menu.json | 42 +++++++-------------- 2 files changed, 17 insertions(+), 28 deletions(-) diff --git a/app/Admin/Controllers/ProblemController.php b/app/Admin/Controllers/ProblemController.php index 9bc05382a..d7ca10f41 100644 --- a/app/Admin/Controllers/ProblemController.php +++ b/app/Admin/Controllers/ProblemController.php @@ -119,6 +119,9 @@ protected function grid() $filter->like('pcode'); $filter->like('title'); }); + + $grid->disableCreateButton(); + return $grid; } diff --git a/app/Admin/menu.json b/app/Admin/menu.json index 435ec74a6..a578e98a8 100644 --- a/app/Admin/menu.json +++ b/app/Admin/menu.json @@ -34,6 +34,18 @@ "created_at": null, "updated_at": null, "roles": [] + }, + { + "id": 15, + "parent_id": 2, + "order": 15, + "title": "Abuses", + "icon": "MDI alert-circle-outline", + "uri": "\/abuses", + "permission": null, + "created_at": "2019-04-11 12:53:03", + "updated_at": "2019-04-12 09:30:12", + "roles": [] } ] }, @@ -117,37 +129,11 @@ "order": 12, "title": "Groups", "icon": "MDI account-multiple", - "uri": "", + "uri": "\/group", "permission": null, "created_at": "2019-04-10 17:00:29", "updated_at": "2019-04-10 17:01:18", - "roles": [], - "children": [ - { - "id": 14, - "parent_id": 13, - "order": 14, - "title": "Groups", - "icon": "MDI account-multiple", - "uri": "\/groups", - "permission": null, - "created_at": "2019-04-11 12:53:03", - "updated_at": "2019-04-12 09:30:12", - "roles": [] - }, - { - "id": 15, - "parent_id": 13, - "order": 15, - "title": "Abuses", - "icon": "MDI alert-circle-outline", - "uri": "\/abuses", - "permission": null, - "created_at": "2019-04-11 12:53:03", - "updated_at": "2019-04-12 09:30:12", - "roles": [] - } - ] + "roles": [] }, { "id": 13, From 2c50e893d15af8178afa0560722484d5227ff492 Mon Sep 17 00:00:00 2001 From: X3ZvaWQ Date: Sat, 18 Jan 2020 17:24:28 +0800 Subject: [PATCH 193/207] fix: repeated package import --- app/Http/Controllers/Contest/AdminController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Contest/AdminController.php b/app/Http/Controllers/Contest/AdminController.php index 4bc915892..e32c5ee46 100644 --- a/app/Http/Controllers/Contest/AdminController.php +++ b/app/Http/Controllers/Contest/AdminController.php @@ -9,7 +9,6 @@ use Imtigger\LaravelJobStatus\JobStatus; use Auth; use Redirect; -use App\Exports\AccountExport; use App\Models\Eloquent\ContestModel as EloquentContestModel; use Excel; use Cache; From 39cd6923be57d79ae11d4b273ab988df0c833709 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2020 21:29:10 +0000 Subject: [PATCH 194/207] Bump npm-asset/perfect-scrollbar from 1.4.0 to 1.5.0 Bumps npm-asset/perfect-scrollbar from 1.4.0 to 1.5.0. Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..7b80f49d9 100644 --- a/composer.lock +++ b/composer.lock @@ -3548,13 +3548,13 @@ "version": "4.17.15-patch1", "source": { "type": "git", - "url": "https://github.com/lodash/lodash.git", - "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" + "url": "git@github.com:lodash/lodash.git", + "reference": "10681716750bfbd9ed862817e4dec70963adc492" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lodash/lodash/zipball/f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30", - "reference": "f9cd8f552b7c8dc4aaa6be48eb9adf026ce4cd30" + "url": "https://api.github.com/repos/lodash/lodash/zipball/10681716750bfbd9ed862817e4dec70963adc492", + "reference": "10681716750bfbd9ed862817e4dec70963adc492" }, "type": "npm-asset", "license": [ @@ -3623,10 +3623,10 @@ }, { "name": "npm-asset/perfect-scrollbar", - "version": "1.4.0", + "version": "1.5.0", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.4.0.tgz" + "url": "https://registry.npmjs.org/perfect-scrollbar/-/perfect-scrollbar-1.5.0.tgz" }, "type": "npm-asset", "license": [ From 662415448f10563e61baeb9b425fc1f6f1991503 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 5 Feb 2020 21:29:46 +0000 Subject: [PATCH 195/207] Bump laravel/socialite from 4.3.1 to 4.3.2 Bumps [laravel/socialite](https://github.com/laravel/socialite) from 4.3.1 to 4.3.2. - [Release notes](https://github.com/laravel/socialite/releases) - [Changelog](https://github.com/laravel/socialite/blob/4.0/CHANGELOG.md) - [Commits](https://github.com/laravel/socialite/compare/v4.3.1...v4.3.2) Signed-off-by: dependabot-preview[bot] --- composer.lock | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..ef14a7dfd 100644 --- a/composer.lock +++ b/composer.lock @@ -1157,16 +1157,16 @@ }, { "name": "guzzlehttp/guzzle", - "version": "6.4.1", + "version": "6.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "0895c932405407fd3a7368b6910c09a24d26db11" + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11", - "reference": "0895c932405407fd3a7368b6910c09a24d26db11", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/43ece0e75098b7ecd8d13918293029e555a50f82", + "reference": "43ece0e75098b7ecd8d13918293029e555a50f82", "shasum": "" }, "require": { @@ -1181,12 +1181,13 @@ "psr/log": "^1.1" }, "suggest": { + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.3-dev" + "dev-master": "6.5-dev" } }, "autoload": { @@ -1219,7 +1220,7 @@ "rest", "web service" ], - "time": "2019-10-23T15:58:00+00:00" + "time": "2019-12-23T11:57:10+00:00" }, { "name": "guzzlehttp/promises", @@ -2187,16 +2188,16 @@ }, { "name": "laravel/socialite", - "version": "v4.3.1", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/laravel/socialite.git", - "reference": "2d670d5b100ef2dc72dc578126b2b97985791f52" + "reference": "4bd66ee416fea04398dee5b8c32d65719a075db4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/socialite/zipball/2d670d5b100ef2dc72dc578126b2b97985791f52", - "reference": "2d670d5b100ef2dc72dc578126b2b97985791f52", + "url": "https://api.github.com/repos/laravel/socialite/zipball/4bd66ee416fea04398dee5b8c32d65719a075db4", + "reference": "4bd66ee416fea04398dee5b8c32d65719a075db4", "shasum": "" }, "require": { @@ -2215,7 +2216,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.x-dev" }, "laravel": { "providers": [ @@ -2247,7 +2248,7 @@ "laravel", "oauth" ], - "time": "2019-11-26T17:39:15+00:00" + "time": "2020-02-04T15:30:01+00:00" }, { "name": "laravel/tinker", From f3042f011446e8892bc521e2e04926ba65a4ebea Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2020 21:23:59 +0000 Subject: [PATCH 196/207] Bump fideloper/proxy from 4.2.2 to 4.3.0 Bumps [fideloper/proxy](https://github.com/fideloper/TrustedProxy) from 4.2.2 to 4.3.0. - [Release notes](https://github.com/fideloper/TrustedProxy/releases) - [Commits](https://github.com/fideloper/TrustedProxy/compare/4.2.2...4.3.0) Signed-off-by: dependabot-preview[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..700475440 100644 --- a/composer.lock +++ b/composer.lock @@ -988,24 +988,24 @@ }, { "name": "fideloper/proxy", - "version": "4.2.2", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "790194d5d3da89a713478875d2e2d05855a90a81" + "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/790194d5d3da89a713478875d2e2d05855a90a81", - "reference": "790194d5d3da89a713478875d2e2d05855a90a81", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a", + "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a", "shasum": "" }, "require": { - "illuminate/contracts": "^5.0|^6.0|^7.0", + "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0", "php": ">=5.4.0" }, "require-dev": { - "illuminate/http": "^5.0|^6.0|^7.0", + "illuminate/http": "^5.0|^6.0|^7.0|^8.0", "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.0" }, @@ -1038,7 +1038,7 @@ "proxy", "trusted proxy" ], - "time": "2019-12-20T13:11:11+00:00" + "time": "2020-02-22T01:51:47+00:00" }, { "name": "graham-campbell/markdown", From 2305907170d20dc4f08247d58b3453d629fa7baf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2020 21:32:55 +0000 Subject: [PATCH 197/207] Bump barryvdh/laravel-dompdf from 0.8.5 to 0.8.6 Bumps [barryvdh/laravel-dompdf](https://github.com/barryvdh/laravel-dompdf) from 0.8.5 to 0.8.6. - [Release notes](https://github.com/barryvdh/laravel-dompdf/releases) - [Commits](https://github.com/barryvdh/laravel-dompdf/compare/v0.8.5...v0.8.6) Signed-off-by: dependabot-preview[bot] --- composer.lock | 63 ++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..cfb6e99d4 100644 --- a/composer.lock +++ b/composer.lock @@ -56,21 +56,21 @@ }, { "name": "barryvdh/laravel-dompdf", - "version": "v0.8.5", + "version": "v0.8.6", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-dompdf.git", - "reference": "7393732b2f3a3ee357974cbb0c46c9b65b84dad1" + "reference": "d7108f78cf5254a2d8c224542967f133e5a6d4e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/7393732b2f3a3ee357974cbb0c46c9b65b84dad1", - "reference": "7393732b2f3a3ee357974cbb0c46c9b65b84dad1", + "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/d7108f78cf5254a2d8c224542967f133e5a6d4e8", + "reference": "d7108f78cf5254a2d8c224542967f133e5a6d4e8", "shasum": "" }, "require": { "dompdf/dompdf": "^0.8", - "illuminate/support": "^5.5|^6", + "illuminate/support": "^5.5|^6|^7", "php": ">=7" }, "type": "library", @@ -108,7 +108,7 @@ "laravel", "pdf" ], - "time": "2019-08-23T14:30:33+00:00" + "time": "2020-02-25T20:44:34+00:00" }, { "name": "composer/installers", @@ -646,28 +646,28 @@ }, { "name": "dompdf/dompdf", - "version": "v0.8.3", + "version": "v0.8.5", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2" + "reference": "6782abfc090b132134cd6cea0ec6d76f0fce2c56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/75f13c700009be21a1965dc2c5b68a8708c22ba2", - "reference": "75f13c700009be21a1965dc2c5b68a8708c22ba2", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/6782abfc090b132134cd6cea0ec6d76f0fce2c56", + "reference": "6782abfc090b132134cd6cea0ec6d76f0fce2c56", "shasum": "" }, "require": { "ext-dom": "*", "ext-mbstring": "*", - "phenx/php-font-lib": "0.5.*", - "phenx/php-svg-lib": "0.3.*", - "php": ">=5.4.0" + "phenx/php-font-lib": "^0.5.1", + "phenx/php-svg-lib": "^0.3.3", + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.5|^6.5", - "squizlabs/php_codesniffer": "2.*" + "phpunit/phpunit": "^7.5", + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "ext-gd": "Needed to process images", @@ -708,7 +708,7 @@ ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", - "time": "2018-12-14T02:40:31+00:00" + "time": "2020-02-20T03:52:51+00:00" }, { "name": "dragonmantank/cron-expression", @@ -4009,28 +4009,28 @@ }, { "name": "phenx/php-svg-lib", - "version": "v0.3.2", + "version": "v0.3.3", "source": { "type": "git", "url": "https://github.com/PhenX/php-svg-lib.git", - "reference": "ccc46ef6340d4b8a4a68047e68d8501ea961442c" + "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/ccc46ef6340d4b8a4a68047e68d8501ea961442c", - "reference": "ccc46ef6340d4b8a4a68047e68d8501ea961442c", + "url": "https://api.github.com/repos/PhenX/php-svg-lib/zipball/5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", + "reference": "5fa61b65e612ce1ae15f69b3d223cb14ecc60e32", "shasum": "" }, "require": { - "sabberworm/php-css-parser": "8.1.*" + "sabberworm/php-css-parser": "^8.3" }, "require-dev": { - "phpunit/phpunit": "~5.0" + "phpunit/phpunit": "^5.5|^6.5" }, "type": "library", "autoload": { - "psr-0": { - "Svg\\": "src/" + "psr-4": { + "Svg\\": "src/Svg" } }, "notification-url": "https://packagist.org/downloads/", @@ -4045,7 +4045,7 @@ ], "description": "A library to read, parse and export to PDF SVG files.", "homepage": "https://github.com/PhenX/php-svg-lib", - "time": "2018-06-03T10:10:03+00:00" + "time": "2019-09-11T20:02:13+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -4691,23 +4691,24 @@ }, { "name": "sabberworm/php-css-parser", - "version": "8.1.0", + "version": "8.3.0", "source": { "type": "git", "url": "https://github.com/sabberworm/PHP-CSS-Parser.git", - "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef" + "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/850cbbcbe7fbb155387a151ea562897a67e242ef", - "reference": "850cbbcbe7fbb155387a151ea562897a67e242ef", + "url": "https://api.github.com/repos/sabberworm/PHP-CSS-Parser/zipball/91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f", + "reference": "91bcc3e3fdb7386c9a2e0e0aa09ca75cc43f121f", "shasum": "" }, "require": { "php": ">=5.3.2" }, "require-dev": { - "phpunit/phpunit": "*" + "codacy/coverage": "^1.4", + "phpunit/phpunit": "~4.8" }, "type": "library", "autoload": { @@ -4731,7 +4732,7 @@ "parser", "stylesheet" ], - "time": "2016-07-19T19:14:21+00:00" + "time": "2019-02-22T07:42:52+00:00" }, { "name": "sebastian/version", From 5808f1cde822333cd6a29683cf12c5971c6990d1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 28 Feb 2020 21:25:36 +0000 Subject: [PATCH 198/207] Bump maatwebsite/excel from 3.1.18 to 3.1.19 Bumps [maatwebsite/excel](https://github.com/Maatwebsite/Laravel-Excel) from 3.1.18 to 3.1.19. - [Release notes](https://github.com/Maatwebsite/Laravel-Excel/releases) - [Commits](https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.18...3.1.19) Signed-off-by: dependabot-preview[bot] --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..bebca3d70 100644 --- a/composer.lock +++ b/composer.lock @@ -2654,21 +2654,21 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.18", + "version": "3.1.19", "source": { "type": "git", "url": "https://github.com/Maatwebsite/Laravel-Excel.git", - "reference": "d0231ab1f4bb93c8695630cb445ada1fdc54add0" + "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/d0231ab1f4bb93c8695630cb445ada1fdc54add0", - "reference": "d0231ab1f4bb93c8695630cb445ada1fdc54add0", + "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", + "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c", "shasum": "" }, "require": { "ext-json": "*", - "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0", + "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0", "php": "^7.0", "phpoffice/phpspreadsheet": "^1.10" }, @@ -2717,7 +2717,7 @@ "php", "phpspreadsheet" ], - "time": "2019-12-24T10:40:12+00:00" + "time": "2020-02-28T15:47:45+00:00" }, { "name": "markbaker/complex", From a4aee8d365839116788312664dfde2bcd691863e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2020 21:26:49 +0000 Subject: [PATCH 199/207] Bump laracasts/utilities from 3.0.1 to 3.1 Bumps [laracasts/utilities](https://github.com/laracasts/PHP-Vars-To-Js-Transformer) from 3.0.1 to 3.1. - [Release notes](https://github.com/laracasts/PHP-Vars-To-Js-Transformer/releases) - [Commits](https://github.com/laracasts/PHP-Vars-To-Js-Transformer/compare/3.0.1...3.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..caafc7b10 100644 --- a/composer.lock +++ b/composer.lock @@ -1606,21 +1606,21 @@ }, { "name": "laracasts/utilities", - "version": "3.0.1", + "version": "3.1", "source": { "type": "git", "url": "https://github.com/laracasts/PHP-Vars-To-Js-Transformer.git", - "reference": "490c6cf4d23c26c94e01867265c84921863a5f19" + "reference": "7c5eb11221de608eef8c70c2d3540c8cd80466e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laracasts/PHP-Vars-To-Js-Transformer/zipball/490c6cf4d23c26c94e01867265c84921863a5f19", - "reference": "490c6cf4d23c26c94e01867265c84921863a5f19", + "url": "https://api.github.com/repos/laracasts/PHP-Vars-To-Js-Transformer/zipball/7c5eb11221de608eef8c70c2d3540c8cd80466e3", + "reference": "7c5eb11221de608eef8c70c2d3540c8cd80466e3", "shasum": "" }, "require": { - "illuminate/support": "^5.0|^6.0", - "php": ">=5.5.0" + "illuminate/support": "^5.0|^6.0|^7.0", + "php": ">=5.5.0|>=7.2.5" }, "require-dev": { "phpspec/phpspec": "~2.0" @@ -1659,7 +1659,7 @@ "javascript", "laravel" ], - "time": "2019-09-04T12:55:27+00:00" + "time": "2020-03-03T16:07:08+00:00" }, { "name": "laravel-admin-ext/api-tester", From 028dca29b2365451b2f035d82f6b2a4b0f0c12f6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 10 Apr 2020 21:43:24 +0000 Subject: [PATCH 200/207] Bump npm-asset/popper.js from 1.16.0 to 1.16.1-patch1 Bumps npm-asset/popper.js from 1.16.0 to 1.16.1-patch1. Signed-off-by: dependabot-preview[bot] --- composer.lock | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..543ba7d3b 100644 --- a/composer.lock +++ b/composer.lock @@ -1510,6 +1510,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -1556,6 +1557,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -2503,6 +2505,7 @@ "strikeout", "strikethrough" ], + "abandoned": "league/commonmark", "time": "2019-06-29T11:34:00+00:00" }, { @@ -3653,10 +3656,10 @@ }, { "name": "npm-asset/popper.js", - "version": "1.16.0", + "version": "1.16.1-patch1", "dist": { "type": "tar", - "url": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.0.tgz" + "url": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz" }, "type": "npm-asset", "license": [ From fca751291f8a79392aa9054563d1a6b275e00afa Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 14 Apr 2020 21:39:23 +0000 Subject: [PATCH 201/207] Bump graham-campbell/markdown from 11.1.0 to 11.2.1 Bumps [graham-campbell/markdown](https://github.com/GrahamCampbell/Laravel-Markdown) from 11.1.0 to 11.2.1. - [Release notes](https://github.com/GrahamCampbell/Laravel-Markdown/releases) - [Changelog](https://github.com/GrahamCampbell/Laravel-Markdown/blob/v11.2.1/CHANGELOG.md) - [Commits](https://github.com/GrahamCampbell/Laravel-Markdown/compare/v11.1.0...v11.2.1) Signed-off-by: dependabot-preview[bot] --- composer.lock | 62 ++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..ebc86ba1b 100644 --- a/composer.lock +++ b/composer.lock @@ -1042,36 +1042,35 @@ }, { "name": "graham-campbell/markdown", - "version": "v11.1.0", + "version": "v11.2.1", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git", - "reference": "80f545b417db2103122c7f094bfa5bb2444b28e1" + "reference": "7ead48c43098b562707a30650843d4279786b0d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/80f545b417db2103122c7f094bfa5bb2444b28e1", - "reference": "80f545b417db2103122c7f094bfa5bb2444b28e1", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/7ead48c43098b562707a30650843d4279786b0d9", + "reference": "7ead48c43098b562707a30650843d4279786b0d9", "shasum": "" }, "require": { - "illuminate/contracts": "^5.5|^6.0", - "illuminate/support": "^5.5|^6.0", - "illuminate/view": "^5.5|^6.0", - "league/commonmark": "^1.0", + "illuminate/contracts": "^5.5|^6.0|^7.0", + "illuminate/support": "^5.5|^6.0|^7.0", + "illuminate/view": "^5.5|^6.0|^7.0", + "league/commonmark": "^1.3", "php": "^7.1.3" }, "require-dev": { - "graham-campbell/analyzer": "^2.1", - "graham-campbell/testbench": "^5.2", - "league/commonmark-extras": "^1.0", - "mockery/mockery": "^1.0", + "graham-campbell/analyzer": "^2.4", + "graham-campbell/testbench": "^5.4", + "mockery/mockery": "^1.3.1", "phpunit/phpunit": "^6.5|^7.0|^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "11.1-dev" + "dev-master": "11.2-dev" }, "laravel": { "providers": [ @@ -1094,7 +1093,7 @@ "email": "graham@alt-three.com" } ], - "description": "Markdown Is A CommonMark Wrapper For Laravel 5", + "description": "Markdown Is A CommonMark Wrapper For Laravel", "keywords": [ "Graham Campbell", "GrahamCampbell", @@ -1106,7 +1105,7 @@ "laravel", "markdown" ], - "time": "2019-08-26T16:31:24+00:00" + "time": "2020-04-14T14:11:12+00:00" }, { "name": "grubersjoe/bing-daily-photo", @@ -1510,6 +1509,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -1556,6 +1556,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -2376,29 +2377,31 @@ }, { "name": "league/commonmark", - "version": "1.0.0", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "7a40f2b0931602c504c2a9692d9f1e33635fd5ef" + "reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/7a40f2b0931602c504c2a9692d9f1e33635fd5ef", - "reference": "7a40f2b0931602c504c2a9692d9f1e33635fd5ef", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/dd3261eb9a322e009fa5d96d19b9ae19708ce04b", + "reference": "dd3261eb9a322e009fa5d96d19b9ae19708ce04b", "shasum": "" }, "require": { "ext-mbstring": "*", "php": "^7.1" }, - "replace": { - "colinodell/commonmark-php": "*" + "conflict": { + "scrutinizer/ocular": "1.7.*" }, "require-dev": { "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.29.0", + "commonmark/commonmark.js": "0.29.1", "erusev/parsedown": "~1.0", + "ext-json": "*", + "github/gfm": "0.29.0", "michelf/php-markdown": "~1.4", "mikehaertl/php-shellcommand": "^1.4", "phpstan/phpstan-shim": "^0.11.5", @@ -2406,16 +2409,13 @@ "scrutinizer/ocular": "^1.5", "symfony/finder": "^4.2" }, - "suggest": { - "league/commonmark-extras": "Library of useful extensions including smart punctuation" - }, "bin": [ "bin/commonmark" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -2435,14 +2435,19 @@ "role": "Lead Developer" } ], - "description": "PHP Markdown parser based on the CommonMark spec", + "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)", "homepage": "https://commonmark.thephpleague.com", "keywords": [ "commonmark", + "flavored", + "gfm", + "github", + "github-flavored", "markdown", + "md", "parser" ], - "time": "2019-06-29T11:19:01+00:00" + "time": "2020-04-13T20:52:18+00:00" }, { "name": "league/commonmark-ext-strikethrough", @@ -2503,6 +2508,7 @@ "strikeout", "strikethrough" ], + "abandoned": "league/commonmark", "time": "2019-06-29T11:34:00+00:00" }, { From fe6e44410b20d6128311ab2b8ddb46c13fd5f10a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 15 Apr 2020 21:32:40 +0000 Subject: [PATCH 202/207] Bump laravel/framework from 5.8.36 to 5.8.38 Bumps [laravel/framework](https://github.com/laravel/framework) from 5.8.36 to 5.8.38. - [Release notes](https://github.com/laravel/framework/releases) - [Changelog](https://github.com/laravel/framework/blob/7.x/CHANGELOG-6.x.md) - [Commits](https://github.com/laravel/framework/compare/v5.8.36...v5.8.38) Signed-off-by: dependabot-preview[bot] --- composer.lock | 322 ++++++++++++++++++++++++++------------------------ 1 file changed, 166 insertions(+), 156 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..61dc89037 100644 --- a/composer.lock +++ b/composer.lock @@ -766,27 +766,27 @@ }, { "name": "egulias/email-validator", - "version": "2.1.12", + "version": "2.1.17", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "a6255605af39f2db7f5cb62e672bd8a7bad8d208" + "reference": "ade6887fd9bd74177769645ab5c474824f8a418a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a6255605af39f2db7f5cb62e672bd8a7bad8d208", - "reference": "a6255605af39f2db7f5cb62e672bd8a7bad8d208", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a", + "reference": "ade6887fd9bd74177769645ab5c474824f8a418a", "shasum": "" }, "require": { "doctrine/lexer": "^1.0.1", - "php": ">= 5.5" + "php": ">=5.5", + "symfony/polyfill-intl-idn": "^1.10" }, "require-dev": { - "dominicsayers/isemail": "dev-master", - "phpunit/phpunit": "^4.8.35||^5.7||^6.0", - "satooshi/php-coveralls": "^1.0.1", - "symfony/phpunit-bridge": "^4.4@dev" + "dominicsayers/isemail": "^3.0.7", + "phpunit/phpunit": "^4.8.36|^7.5.15", + "satooshi/php-coveralls": "^1.0.1" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -820,7 +820,7 @@ "validation", "validator" ], - "time": "2019-12-20T12:49:39+00:00" + "time": "2020-02-13T22:36:52+00:00" }, { "name": "encore/laravel-admin", @@ -895,16 +895,16 @@ }, { "name": "erusev/parsedown", - "version": "1.7.3", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", - "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/cb17b6477dfff935958ba01325f2e8a2bfa6dab3", + "reference": "cb17b6477dfff935958ba01325f2e8a2bfa6dab3", "shasum": "" }, "require": { @@ -937,7 +937,7 @@ "markdown", "parser" ], - "time": "2019-03-17T18:48:37+00:00" + "time": "2019-12-30T22:54:17+00:00" }, { "name": "ezyang/htmlpurifier", @@ -1510,6 +1510,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -1556,6 +1557,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -2039,16 +2041,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.36", + "version": "v5.8.38", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ccf857af50897eda43ceaf12e318cf214e0e4e95" + "reference": "78eb4dabcc03e189620c16f436358d41d31ae11f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ccf857af50897eda43ceaf12e318cf214e0e4e95", - "reference": "ccf857af50897eda43ceaf12e318cf214e0e4e95", + "url": "https://api.github.com/repos/laravel/framework/zipball/78eb4dabcc03e189620c16f436358d41d31ae11f", + "reference": "78eb4dabcc03e189620c16f436358d41d31ae11f", "shasum": "" }, "require": { @@ -2183,7 +2185,7 @@ "framework", "laravel" ], - "time": "2019-12-17T16:00:14+00:00" + "time": "2020-04-14T14:14:36+00:00" }, { "name": "laravel/socialite", @@ -2503,20 +2505,21 @@ "strikeout", "strikethrough" ], + "abandoned": "league/commonmark", "time": "2019-06-29T11:34:00+00:00" }, { "name": "league/flysystem", - "version": "1.0.62", + "version": "1.0.66", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "14dd5d7dff5fbc29ca9a2a53ff109760e40d91a0" + "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/14dd5d7dff5fbc29ca9a2a53ff109760e40d91a0", - "reference": "14dd5d7dff5fbc29ca9a2a53ff109760e40d91a0", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/021569195e15f8209b1c4bebb78bd66aa4f08c21", + "reference": "021569195e15f8209b1c4bebb78bd66aa4f08c21", "shasum": "" }, "require": { @@ -2528,7 +2531,7 @@ }, "require-dev": { "phpspec/phpspec": "^3.4", - "phpunit/phpunit": "^5.7.10" + "phpunit/phpunit": "^5.7.26" }, "suggest": { "ext-fileinfo": "Required for MimeType", @@ -2587,7 +2590,7 @@ "sftp", "storage" ], - "time": "2019-12-29T14:46:55+00:00" + "time": "2020-03-17T18:58:12+00:00" }, { "name": "league/oauth1-client", @@ -3097,16 +3100,16 @@ }, { "name": "nesbot/carbon", - "version": "2.28.0", + "version": "2.32.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "e2bcbcd43e67ee6101d321d5de916251d2870ca8" + "reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e2bcbcd43e67ee6101d321d5de916251d2870ca8", - "reference": "e2bcbcd43e67ee6101d321d5de916251d2870ca8", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/f10e22cf546704fab1db4ad4b9dedbc5c797a0dc", + "reference": "f10e22cf546704fab1db4ad4b9dedbc5c797a0dc", "shasum": "" }, "require": { @@ -3115,9 +3118,10 @@ "symfony/translation": "^3.4 || ^4.0 || ^5.0" }, "require-dev": { + "doctrine/orm": "^2.7", "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", "kylekatarnls/multi-tester": "^1.1", - "phpmd/phpmd": "dev-php-7.1-compatibility", + "phpmd/phpmd": "^2.8", "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" @@ -3163,7 +3167,7 @@ "datetime", "time" ], - "time": "2019-12-16T16:30:25+00:00" + "time": "2020-03-31T13:43:19+00:00" }, { "name": "nikic/php-parser", @@ -4142,20 +4146,20 @@ }, { "name": "phpoption/phpoption", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959" + "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959", - "reference": "77f7c4d2e65413aff5b5a8cc8b3caf7a28d81959", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/4acfd6a4b33a509d8c88f50e5222f734b6aeebae", + "reference": "4acfd6a4b33a509d8c88f50e5222f734b6aeebae", "shasum": "" }, "require": { - "php": "^5.5.9 || ^7.0" + "php": "^5.5.9 || ^7.0 || ^8.0" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.3", @@ -4193,7 +4197,7 @@ "php", "type" ], - "time": "2019-12-15T19:35:24+00:00" + "time": "2020-03-21T18:07:53+00:00" }, { "name": "predis/predis", @@ -4346,16 +4350,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -4389,7 +4393,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "psr/simple-cache", @@ -4555,16 +4559,16 @@ }, { "name": "ramsey/uuid", - "version": "3.9.2", + "version": "3.9.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "7779489a47d443f845271badbdcedfe4df8e06fb" + "reference": "7e1633a6964b48589b142d60542f9ed31bd37a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/7779489a47d443f845271badbdcedfe4df8e06fb", - "reference": "7779489a47d443f845271badbdcedfe4df8e06fb", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/7e1633a6964b48589b142d60542f9ed31bd37a92", + "reference": "7e1633a6964b48589b142d60542f9ed31bd37a92", "shasum": "" }, "require": { @@ -4638,7 +4642,7 @@ "identifier", "uuid" ], - "time": "2019-12-17T08:18:51+00:00" + "time": "2020-02-21T04:36:14+00:00" }, { "name": "rmccue/requests", @@ -5011,16 +5015,16 @@ }, { "name": "symfony/console", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "82437719dab1e6bdd28726af14cb345c2ec816d0" + "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/82437719dab1e6bdd28726af14cb345c2ec816d0", - "reference": "82437719dab1e6bdd28726af14cb345c2ec816d0", + "url": "https://api.github.com/repos/symfony/console/zipball/10bb3ee3c97308869d53b3e3d03f6ac23ff985f7", + "reference": "10bb3ee3c97308869d53b3e3d03f6ac23ff985f7", "shasum": "" }, "require": { @@ -5083,20 +5087,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-12-17T10:32:23+00:00" + "time": "2020-03-30T11:41:10+00:00" }, { "name": "symfony/css-selector", - "version": "v5.0.2", + "version": "v5.0.7", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837" + "reference": "5f8d5271303dad260692ba73dfa21777d38e124e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/19d29e7098b7b2c3313cb03902ca30f100dcb837", - "reference": "19d29e7098b7b2c3313cb03902ca30f100dcb837", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/5f8d5271303dad260692ba73dfa21777d38e124e", + "reference": "5f8d5271303dad260692ba73dfa21777d38e124e", "shasum": "" }, "require": { @@ -5136,20 +5140,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-11-18T17:27:11+00:00" + "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/debug", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5c4c1db977dc70bb3250e1308d3e8c6341aa38f5" + "reference": "346636d2cae417992ecfd761979b2ab98b339a45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5c4c1db977dc70bb3250e1308d3e8c6341aa38f5", - "reference": "5c4c1db977dc70bb3250e1308d3e8c6341aa38f5", + "url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45", + "reference": "346636d2cae417992ecfd761979b2ab98b339a45", "shasum": "" }, "require": { @@ -5192,7 +5196,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-12-16T14:46:54+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/dom-crawler", @@ -5257,22 +5261,22 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "6d7d7712a6ff5215ec26215672293b154f1db8c1" + "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/6d7d7712a6ff5215ec26215672293b154f1db8c1", - "reference": "6d7d7712a6ff5215ec26215672293b154f1db8c1", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/7e9828fc98aa1cf27b422fe478a84f5b0abb7358", + "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", - "symfony/debug": "^4.4", + "symfony/debug": "^4.4.5", "symfony/var-dumper": "^4.4|^5.0" }, "require-dev": { @@ -5309,20 +5313,20 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "time": "2019-12-16T14:46:54+00:00" + "time": "2020-03-30T14:07:33+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f" + "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b3c3068a72623287550fe20b84a2b01dcba2686f", - "reference": "b3c3068a72623287550fe20b84a2b01dcba2686f", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/abc8e3618bfdb55e44c8c6a00abd333f831bbfed", + "reference": "abc8e3618bfdb55e44c8c6a00abd333f831bbfed", "shasum": "" }, "require": { @@ -5379,7 +5383,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-11-28T13:33:56+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -5441,16 +5445,16 @@ }, { "name": "symfony/finder", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e" + "reference": "5729f943f9854c5781984ed4907bbb817735776b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ce8743441da64c41e2a667b8eb66070444ed911e", - "reference": "ce8743441da64c41e2a667b8eb66070444ed911e", + "url": "https://api.github.com/repos/symfony/finder/zipball/5729f943f9854c5781984ed4907bbb817735776b", + "reference": "5729f943f9854c5781984ed4907bbb817735776b", "shasum": "" }, "require": { @@ -5486,20 +5490,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-11-17T21:56:56+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "fcae1cff5b57b2a9c3aabefeb1527678705ddb62" + "reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fcae1cff5b57b2a9c3aabefeb1527678705ddb62", - "reference": "fcae1cff5b57b2a9c3aabefeb1527678705ddb62", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/62f92509c9abfd1f73e17b8cf1b72c0bdac6611b", + "reference": "62f92509c9abfd1f73e17b8cf1b72c0bdac6611b", "shasum": "" }, "require": { @@ -5541,20 +5545,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-12-19T15:57:49+00:00" + "time": "2020-03-30T14:07:33+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "fe310d2e95cd4c356836c8ecb0895a46d97fede2" + "reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fe310d2e95cd4c356836c8ecb0895a46d97fede2", - "reference": "fe310d2e95cd4c356836c8ecb0895a46d97fede2", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f356a489e51856b99908005eb7f2c51a1dfc95dc", + "reference": "f356a489e51856b99908005eb7f2c51a1dfc95dc", "shasum": "" }, "require": { @@ -5631,20 +5635,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-12-19T16:23:40+00:00" + "time": "2020-03-30T14:59:15+00:00" }, { "name": "symfony/mime", - "version": "v5.0.2", + "version": "v5.0.7", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" + "reference": "481b7d6da88922fb1e0d86a943987722b08f3955" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", + "url": "https://api.github.com/repos/symfony/mime/zipball/481b7d6da88922fb1e0d86a943987722b08f3955", + "reference": "481b7d6da88922fb1e0d86a943987722b08f3955", "shasum": "" }, "require": { @@ -5693,20 +5697,20 @@ "mime", "mime-type" ], - "time": "2019-11-30T14:12:50+00:00" + "time": "2020-03-27T16:56:45+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "shasum": "" }, "require": { @@ -5718,7 +5722,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5751,20 +5755,20 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36" + "reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/a019efccc03f1a335af6b4f20c30f5ea8060be36", - "reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ad6d62792bfbcfc385dd34b424d4fcf9712a32c8", + "reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8", "shasum": "" }, "require": { @@ -5776,7 +5780,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5810,26 +5814,26 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" + "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", + "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.9" + "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -5837,7 +5841,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5872,20 +5876,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "shasum": "" }, "require": { @@ -5897,7 +5901,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5931,20 +5935,20 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" + "reference": "37b0976c78b94856543260ce09b460a7bc852747" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", + "reference": "37b0976c78b94856543260ce09b460a7bc852747", "shasum": "" }, "require": { @@ -5953,7 +5957,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5986,20 +5990,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f" + "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f", - "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", + "reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", "shasum": "" }, "require": { @@ -6008,7 +6012,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -6044,20 +6048,20 @@ "portable", "shim" ], - "time": "2019-11-27T16:25:15+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/process", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "b84501ad50adb72a94fb460a5b5c91f693e99c9b" + "reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/b84501ad50adb72a94fb460a5b5c91f693e99c9b", - "reference": "b84501ad50adb72a94fb460a5b5c91f693e99c9b", + "url": "https://api.github.com/repos/symfony/process/zipball/3e40e87a20eaf83a1db825e1fa5097ae89042db3", + "reference": "3e40e87a20eaf83a1db825e1fa5097ae89042db3", "shasum": "" }, "require": { @@ -6093,20 +6097,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-12-06T10:06:46+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/routing", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "628bcafae1b2043969378dcfbf9c196539a38722" + "reference": "0f562fa613e288d7dbae6c63abbc9b33ed75a8f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/628bcafae1b2043969378dcfbf9c196539a38722", - "reference": "628bcafae1b2043969378dcfbf9c196539a38722", + "url": "https://api.github.com/repos/symfony/routing/zipball/0f562fa613e288d7dbae6c63abbc9b33ed75a8f8", + "reference": "0f562fa613e288d7dbae6c63abbc9b33ed75a8f8", "shasum": "" }, "require": { @@ -6169,7 +6173,7 @@ "uri", "url" ], - "time": "2019-12-12T12:53:52+00:00" + "time": "2020-03-30T11:41:10+00:00" }, { "name": "symfony/service-contracts", @@ -6231,16 +6235,16 @@ }, { "name": "symfony/translation", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f7669f48a9633bf8139bc026c755e894b7206677" + "reference": "4e54d336f2eca5facad449d0b0118bb449375b76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f7669f48a9633bf8139bc026c755e894b7206677", - "reference": "f7669f48a9633bf8139bc026c755e894b7206677", + "url": "https://api.github.com/repos/symfony/translation/zipball/4e54d336f2eca5facad449d0b0118bb449375b76", + "reference": "4e54d336f2eca5facad449d0b0118bb449375b76", "shasum": "" }, "require": { @@ -6303,7 +6307,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-12-12T12:53:52+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/translation-contracts", @@ -6364,16 +6368,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.2", + "version": "v4.4.7", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "be330f919bdb395d1e0c3f2bfb8948512d6bdd99" + "reference": "5a0c2d93006131a36cf6f767d10e2ca8333b0d4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/be330f919bdb395d1e0c3f2bfb8948512d6bdd99", - "reference": "be330f919bdb395d1e0c3f2bfb8948512d6bdd99", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5a0c2d93006131a36cf6f767d10e2ca8333b0d4a", + "reference": "5a0c2d93006131a36cf6f767d10e2ca8333b0d4a", "shasum": "" }, "require": { @@ -6436,7 +6440,7 @@ "debug", "dump" ], - "time": "2019-12-18T13:41:29+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -6489,16 +6493,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v3.6.0", + "version": "v3.6.3", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156" + "reference": "1b3103013797f04521c6cae5560f604649484066" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156", - "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1b3103013797f04521c6cae5560f604649484066", + "reference": "1b3103013797f04521c6cae5560f604649484066", "shasum": "" }, "require": { @@ -6507,8 +6511,14 @@ "symfony/polyfill-ctype": "^1.9" }, "require-dev": { + "ext-filter": "*", + "ext-pcre": "*", "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, + "suggest": { + "ext-filter": "Required to use the boolean validator.", + "ext-pcre": "Required to use most of the library." + }, "type": "library", "extra": { "branch-alias": { @@ -6542,7 +6552,7 @@ "env", "environment" ], - "time": "2019-09-10T21:37:39+00:00" + "time": "2020-04-12T15:18:03+00:00" } ], "packages-dev": [ From c3f52d2eaf5d34ae5d586c4213a5788d6ffcf935 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2020 21:31:23 +0000 Subject: [PATCH 203/207] Bump encore/laravel-admin from 1.7.9 to 1.7.15 Bumps [encore/laravel-admin](https://github.com/z-song/laravel-admin) from 1.7.9 to 1.7.15. - [Release notes](https://github.com/z-song/laravel-admin/releases) - [Commits](https://github.com/z-song/laravel-admin/compare/v1.7.9...v1.7.15) Signed-off-by: dependabot-preview[bot] --- composer.lock | 71 +++++++++++++++++++++++++++------------------------ 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..604c45aa0 100644 --- a/composer.lock +++ b/composer.lock @@ -349,16 +349,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.10.0", + "version": "2.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934" + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934", - "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/aab745e7b6b2de3b47019da81e7225e14dcfdac8", + "reference": "aab745e7b6b2de3b47019da81e7225e14dcfdac8", "shasum": "" }, "require": { @@ -370,9 +370,11 @@ "require-dev": { "doctrine/coding-standard": "^6.0", "jetbrains/phpstorm-stubs": "^2019.1", - "phpstan/phpstan": "^0.11.3", + "nikic/php-parser": "^4.4", + "phpstan/phpstan": "^0.12", "phpunit/phpunit": "^8.4.1", - "symfony/console": "^2.0.5|^3.0|^4.0|^5.0" + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0", + "vimeo/psalm": "^3.11" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -437,7 +439,7 @@ "sqlserver", "sqlsrv" ], - "time": "2019-11-03T16:50:43+00:00" + "time": "2020-04-20T17:19:26+00:00" }, { "name": "doctrine/event-manager", @@ -824,31 +826,29 @@ }, { "name": "encore/laravel-admin", - "version": "v1.7.9", + "version": "v1.7.15", "source": { "type": "git", "url": "https://github.com/z-song/laravel-admin.git", - "reference": "216662ad1aff4073c55288805cf565cba1817073" + "reference": "f681aece0c2730e5d1082f9beb37243eb7d6e3c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/z-song/laravel-admin/zipball/216662ad1aff4073c55288805cf565cba1817073", - "reference": "216662ad1aff4073c55288805cf565cba1817073", + "url": "https://api.github.com/repos/z-song/laravel-admin/zipball/f681aece0c2730e5d1082f9beb37243eb7d6e3c8", + "reference": "f681aece0c2730e5d1082f9beb37243eb7d6e3c8", "shasum": "" }, "require": { "doctrine/dbal": "2.*", - "laravel/framework": "~5.5|~6.0", + "laravel/framework": ">=5.5", "php": ">=7.0.0", "symfony/dom-crawler": "~3.1|~4.0|~5.0" }, "require-dev": { "fzaninotto/faker": "~1.4", "intervention/image": "~2.3", - "laravel/browser-kit-testing": "^2.0", - "laravel/laravel": "~5.5|~6.0", - "phpunit/phpunit": "~6.0|~8.0", - "symfony/css-selector": "~3.1" + "laravel/browser-kit-testing": "^6.0", + "laravel/laravel": ">=5.5" }, "suggest": { "intervention/image": "Required to handling and manipulation upload images (~2.3).", @@ -891,7 +891,7 @@ "grid", "laravel" ], - "time": "2019-12-31T08:00:56+00:00" + "time": "2020-04-27T07:15:45+00:00" }, { "name": "erusev/parsedown", @@ -1510,6 +1510,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -1556,6 +1557,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -2503,6 +2505,7 @@ "strikeout", "strikethrough" ], + "abandoned": "league/commonmark", "time": "2019-06-29T11:34:00+00:00" }, { @@ -5196,16 +5199,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v5.0.2", + "version": "v5.0.7", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "0a0a73a0836926898b6fcd6817fe697487a73d97" + "reference": "892311d23066844a267ac1a903d8a9d79968a1a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0a0a73a0836926898b6fcd6817fe697487a73d97", - "reference": "0a0a73a0836926898b6fcd6817fe697487a73d97", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/892311d23066844a267ac1a903d8a9d79968a1a7", + "reference": "892311d23066844a267ac1a903d8a9d79968a1a7", "shasum": "" }, "require": { @@ -5253,7 +5256,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-11-18T17:27:11+00:00" + "time": "2020-03-30T11:42:42+00:00" }, { "name": "symfony/error-handler", @@ -5697,16 +5700,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "shasum": "" }, "require": { @@ -5718,7 +5721,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5751,7 +5754,7 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/polyfill-iconv", @@ -5876,16 +5879,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "shasum": "" }, "require": { @@ -5897,7 +5900,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5931,7 +5934,7 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-php72", From d65a256e522d22112aaa8895ea405ce7b978bed5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2020 21:21:58 +0000 Subject: [PATCH 204/207] [Security] Bump symfony/http-foundation from 4.4.2 to 4.4.8 Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.4.2 to 4.4.8. **This update includes security fixes.** - [Release notes](https://github.com/symfony/http-foundation/releases) - [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/http-foundation/compare/v4.4.2...v4.4.8) Signed-off-by: dependabot-preview[bot] --- composer.lock | 61 +++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..846e3f217 100644 --- a/composer.lock +++ b/composer.lock @@ -1510,6 +1510,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -1556,6 +1557,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -2503,6 +2505,7 @@ "strikeout", "strikethrough" ], + "abandoned": "league/commonmark", "time": "2019-06-29T11:34:00+00:00" }, { @@ -5490,16 +5493,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.2", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "fcae1cff5b57b2a9c3aabefeb1527678705ddb62" + "reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fcae1cff5b57b2a9c3aabefeb1527678705ddb62", - "reference": "fcae1cff5b57b2a9c3aabefeb1527678705ddb62", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2", + "reference": "ec5bd254c223786f5fa2bb49a1e705c1b8e7cee2", "shasum": "" }, "require": { @@ -5541,7 +5544,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-12-19T15:57:49+00:00" + "time": "2020-04-18T20:40:08+00:00" }, { "name": "symfony/http-kernel", @@ -5635,16 +5638,16 @@ }, { "name": "symfony/mime", - "version": "v5.0.2", + "version": "v5.0.8", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79" + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0e6a4ced216e49d457eddcefb61132173a876d79", - "reference": "0e6a4ced216e49d457eddcefb61132173a876d79", + "url": "https://api.github.com/repos/symfony/mime/zipball/5d6c81c39225a750f3f43bee15f03093fb9aaa0b", + "reference": "5d6c81c39225a750f3f43bee15f03093fb9aaa0b", "shasum": "" }, "require": { @@ -5693,7 +5696,7 @@ "mime", "mime-type" ], - "time": "2019-11-30T14:12:50+00:00" + "time": "2020-04-17T03:29:44+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5814,22 +5817,22 @@ }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" + "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", + "reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.9" + "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -5837,7 +5840,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5872,20 +5875,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "shasum": "" }, "require": { @@ -5897,7 +5900,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5931,20 +5934,20 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" + "reference": "37b0976c78b94856543260ce09b460a7bc852747" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", + "reference": "37b0976c78b94856543260ce09b460a7bc852747", "shasum": "" }, "require": { @@ -5953,7 +5956,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5986,7 +5989,7 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/polyfill-php73", From b24967f8c6675521930dcfaef4ee9841f5f994a2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2020 21:23:32 +0000 Subject: [PATCH 205/207] [Security] Bump symfony/error-handler from 4.4.2 to 4.4.8 Bumps [symfony/error-handler](https://github.com/symfony/error-handler) from 4.4.2 to 4.4.8. **This update includes a security fix.** - [Release notes](https://github.com/symfony/error-handler/releases) - [Changelog](https://github.com/symfony/error-handler/blob/master/CHANGELOG.md) - [Commits](https://github.com/symfony/error-handler/compare/v4.4.2...v4.4.8) Signed-off-by: dependabot-preview[bot] --- composer.lock | 69 +++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/composer.lock b/composer.lock index 76f937ef5..818501277 100644 --- a/composer.lock +++ b/composer.lock @@ -1510,6 +1510,7 @@ "email": "jakub.onderka@gmail.com" } ], + "abandoned": "php-parallel-lint/php-console-color", "time": "2018-09-29T17:23:10+00:00" }, { @@ -1556,6 +1557,7 @@ } ], "description": "Highlight PHP code in terminal", + "abandoned": "php-parallel-lint/php-console-highlighter", "time": "2018-09-29T18:48:56+00:00" }, { @@ -2503,6 +2505,7 @@ "strikeout", "strikethrough" ], + "abandoned": "league/commonmark", "time": "2019-06-29T11:34:00+00:00" }, { @@ -4346,16 +4349,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -4389,7 +4392,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "psr/simple-cache", @@ -5140,16 +5143,16 @@ }, { "name": "symfony/debug", - "version": "v4.4.2", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5c4c1db977dc70bb3250e1308d3e8c6341aa38f5" + "reference": "346636d2cae417992ecfd761979b2ab98b339a45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5c4c1db977dc70bb3250e1308d3e8c6341aa38f5", - "reference": "5c4c1db977dc70bb3250e1308d3e8c6341aa38f5", + "url": "https://api.github.com/repos/symfony/debug/zipball/346636d2cae417992ecfd761979b2ab98b339a45", + "reference": "346636d2cae417992ecfd761979b2ab98b339a45", "shasum": "" }, "require": { @@ -5192,7 +5195,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-12-16T14:46:54+00:00" + "time": "2020-03-27T16:54:36+00:00" }, { "name": "symfony/dom-crawler", @@ -5257,22 +5260,22 @@ }, { "name": "symfony/error-handler", - "version": "v4.4.2", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "6d7d7712a6ff5215ec26215672293b154f1db8c1" + "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/6d7d7712a6ff5215ec26215672293b154f1db8c1", - "reference": "6d7d7712a6ff5215ec26215672293b154f1db8c1", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/7e9828fc98aa1cf27b422fe478a84f5b0abb7358", + "reference": "7e9828fc98aa1cf27b422fe478a84f5b0abb7358", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", - "symfony/debug": "^4.4", + "symfony/debug": "^4.4.5", "symfony/var-dumper": "^4.4|^5.0" }, "require-dev": { @@ -5309,7 +5312,7 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "time": "2019-12-16T14:46:54+00:00" + "time": "2020-03-30T14:07:33+00:00" }, { "name": "symfony/event-dispatcher", @@ -5876,16 +5879,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", + "reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "shasum": "" }, "require": { @@ -5897,7 +5900,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5931,20 +5934,20 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-03-09T19:04:49+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" + "reference": "37b0976c78b94856543260ce09b460a7bc852747" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", + "reference": "37b0976c78b94856543260ce09b460a7bc852747", "shasum": "" }, "require": { @@ -5953,7 +5956,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -5986,7 +5989,7 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "symfony/polyfill-php73", @@ -6364,16 +6367,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.4.2", + "version": "v4.4.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "be330f919bdb395d1e0c3f2bfb8948512d6bdd99" + "reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/be330f919bdb395d1e0c3f2bfb8948512d6bdd99", - "reference": "be330f919bdb395d1e0c3f2bfb8948512d6bdd99", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c587e04ce5d1aa62d534a038f574d9a709e814cf", + "reference": "c587e04ce5d1aa62d534a038f574d9a709e814cf", "shasum": "" }, "require": { @@ -6436,7 +6439,7 @@ "debug", "dump" ], - "time": "2019-12-18T13:41:29+00:00" + "time": "2020-04-12T16:14:02+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", From f2b685f25543d955077579b6541f80449c78c5ef Mon Sep 17 00:00:00 2001 From: X3ZvaWQ Date: Fri, 1 May 2020 02:03:41 +0800 Subject: [PATCH 206/207] fix: typo --- resources/views/contest/board/admin.blade.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/contest/board/admin.blade.php b/resources/views/contest/board/admin.blade.php index b223c8e26..959df9f19 100644 --- a/resources/views/contest/board/admin.blade.php +++ b/resources/views/contest/board/admin.blade.php @@ -178,13 +178,13 @@ - --}} @if($verified && $basic['anticheated']) - --}} @endif @if(time() >= strtotime($basic['begin_time']))
      From bd669cd1fdfdcb2af0f2c8d009eec522c63f141a Mon Sep 17 00:00:00 2001 From: X3ZvaWQ Date: Fri, 1 May 2020 02:22:31 +0800 Subject: [PATCH 207/207] fix: class name error in ContestModel --- app/Models/Eloquent/ContestModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Eloquent/ContestModel.php b/app/Models/Eloquent/ContestModel.php index 1ff029c27..8ba4de281 100644 --- a/app/Models/Eloquent/ContestModel.php +++ b/app/Models/Eloquent/ContestModel.php @@ -122,7 +122,7 @@ public function submissions() public function group() { - return $this->hasOne('App\Models\Eloquent\GroupModel','gid','gid'); + return $this->hasOne('App\Models\Eloquent\Group','gid','gid'); } public function getFrozenTimeAttribute()