Merge branch 'dev' into 'master'
Dev See merge request !1
Showing
with
4569 additions
and
55 deletions
app/Console/Commands/CreateNotice.php
0 → 100755
app/Http/Controllers/NoticeController.php
0 → 100644
app/Logic/MqLogic.php
0 → 100644
app/Logic/SystemNoticeLogic.php
0 → 100644
This diff is collapsed.
Click to expand it.
app/Model/SystemBulletinModel.php
0 → 100644
app/Model/SystemPreachModel.php
0 → 100644
app/Model/SystemUpdateModel.php
0 → 100644
... | ... | @@ -10,7 +10,8 @@ |
"justinrainbow/json-schema": "~1.3", | ||
"maatwebsite/excel": "~2.0.0", | ||
"guzzlehttp/guzzle": "^6.3", | ||
"php-amqplib/php-amqplib": "2.6.*" | ||
"php-amqplib/php-amqplib": "2.6.*", | ||
"predis/predis": "^1.1" | ||
}, | ||
"require-dev": { | ||
"fzaninotto/faker": "~1.4", | ||
... | ... |
public/js/Message/getNotice.js
0 → 100644
public/js/Message/systemBulletin.js
0 → 100755
public/js/Message/systemPreaching.js
0 → 100755
public/js/Message/systemUpdate.js
0 → 100755
resources/views/emails/default.blade.php
0 → 100644
vendor/composer/InstalledVersions.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
This diff could not be displayed because it is too large.
vendor/composer/installed.php
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/composer/platform_check.php
0 → 100644
vendor/predis/predis/CHANGELOG.md
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/CONTRIBUTING.md
0 → 100644
vendor/predis/predis/FAQ.md
0 → 100644
vendor/predis/predis/LICENSE
0 → 100644
vendor/predis/predis/README.md
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/VERSION
0 → 100644
vendor/predis/predis/autoload.php
0 → 100644
vendor/predis/predis/bin/create-command-test
0 → 100755
vendor/predis/predis/bin/create-pear
0 → 100755
vendor/predis/predis/bin/create-phar
0 → 100755
vendor/predis/predis/bin/create-single-file
0 → 100755
This diff is collapsed.
Click to expand it.
vendor/predis/predis/composer.json
0 → 100644
{ | ||
"name": "predis/predis", | ||
"type": "library", | ||
"description": "Flexible and feature-complete Redis client for PHP and HHVM", | ||
"keywords": ["nosql", "redis", "predis"], | ||
"homepage": "http://github.com/predis/predis", | ||
"license": "MIT", | ||
"support": { | ||
"issues": "https://github.com/predis/predis/issues" | ||
}, | ||
"authors": [ | ||
{ | ||
"name": "Daniele Alessandri", | ||
"email": "suppakilla@gmail.com", | ||
"homepage": "http://clorophilla.net", | ||
"role": "Creator & Maintainer" | ||
}, | ||
{ | ||
"name": "Till Krüss", | ||
"homepage": "https://till.im", | ||
"role": "Maintainer" | ||
} | ||
], | ||
"funding": [ | ||
{ | ||
"type": "github", | ||
"url": "https://github.com/sponsors/tillkruss" | ||
} | ||
], | ||
"require": { | ||
"php": ">=5.3.9" | ||
}, | ||
"require-dev": { | ||
"phpunit/phpunit": "~4.8" | ||
}, | ||
"suggest": { | ||
"ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol", | ||
"ext-curl": "Allows access to Webdis when paired with phpiredis" | ||
}, | ||
"autoload": { | ||
"psr-4": { | ||
"Predis\\": "src/" | ||
} | ||
}, | ||
"scripts": { | ||
"post-update-cmd": "@php -f tests/apply-patches.php" | ||
} | ||
} |
vendor/predis/predis/examples/shared.php
0 → 100644
vendor/predis/predis/package.ini
0 → 100644
vendor/predis/predis/src/Autoloader.php
0 → 100644
vendor/predis/predis/src/Client.php
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/ClientException.php
0 → 100644
vendor/predis/predis/src/ClientInterface.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/Command.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/HashGet.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/HashSet.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/KeyDump.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/KeyKeys.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/KeyMove.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/KeyScan.php
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/KeySort.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/KeyType.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/ListSet.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/SetAdd.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/SetMove.php
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/SetPop.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/SetScan.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Command/ZSetAdd.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Pipeline/Atomic.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/PredisException.php
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Profile/Factory.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/PubSub/Consumer.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Response/Error.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Response/Status.php
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/src/Session/Handler.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
vendor/predis/predis/tests/README.md
0 → 100644
This diff is collapsed.
Click to expand it.
vendor/predis/predis/tests/apply-patches.php
0 → 100644
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment