mirror of
https://github.com/Karaka-Management/oms-Admin.git
synced 2026-02-16 12:28:41 +00:00
fix name
This commit is contained in:
parent
c5d3478d67
commit
f9b775f15f
2
.github/user_bug_report.md
vendored
2
.github/user_bug_report.md
vendored
|
|
@ -28,7 +28,7 @@ If applicable, add screenshots to help explain your problem.
|
||||||
- System: [e.g. PC or iPhone11, ...]
|
- System: [e.g. PC or iPhone11, ...]
|
||||||
- OS: [e.g. iOS]
|
- OS: [e.g. iOS]
|
||||||
- Browser [e.g. chrome, safari]
|
- Browser [e.g. chrome, safari]
|
||||||
- Orange Management Version [e.g. 22]
|
- KarakaVersion [e.g. 22]
|
||||||
|
|
||||||
# Additional Information
|
# Additional Information
|
||||||
Add any other context about the problem here.
|
Add any other context about the problem here.
|
||||||
|
|
|
||||||
16
.github/workflows/main.yml
vendored
16
.github/workflows/main.yml
vendored
|
|
@ -34,7 +34,7 @@ jobs:
|
||||||
if: steps.git-check.outputs.modified == 'true'
|
if: steps.git-check.outputs.modified == 'true'
|
||||||
run: |
|
run: |
|
||||||
git config --global user.name 'Formatter Bot'
|
git config --global user.name 'Formatter Bot'
|
||||||
git config --global user.email 'formatter.bot@orange-management.email'
|
git config --global user.email 'formatter.bot@karaka.app'
|
||||||
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
|
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
|
||||||
git commit -am "Automated formatting changes"
|
git commit -am "Automated formatting changes"
|
||||||
git push
|
git push
|
||||||
|
|
@ -84,29 +84,29 @@ jobs:
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
ref: develop
|
ref: develop
|
||||||
repository: Orange-Management/Build
|
repository: Karaka/Build
|
||||||
path: Build
|
path: Build
|
||||||
- name: Checkout Resource Repository
|
- name: Checkout Resource Repository
|
||||||
uses: actions/checkout@master
|
uses: actions/checkout@master
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
ref: develop
|
ref: develop
|
||||||
repository: Orange-Management/Resources
|
repository: Karaka/Resources
|
||||||
path: Resources
|
path: Resources
|
||||||
- name: Checkout phpOMS Repository
|
- name: Checkout phpOMS Repository
|
||||||
uses: actions/checkout@master
|
uses: actions/checkout@master
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
ref: develop
|
ref: develop
|
||||||
repository: Orange-Management/phpOMS
|
repository: Karaka/phpOMS
|
||||||
path: phpOMS
|
path: phpOMS
|
||||||
- name: Checkout Orange-Management Repository
|
- name: Checkout Karaka Repository
|
||||||
uses: actions/checkout@master
|
uses: actions/checkout@master
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
ref: develop
|
ref: develop
|
||||||
repository: Orange-Management/Orange-Management
|
repository: Karaka/Karaka
|
||||||
path: Orange-Management
|
path: Karaka
|
||||||
- name: Setup PHP, with composer and extensions
|
- name: Setup PHP, with composer and extensions
|
||||||
uses: shivammathur/setup-php@master
|
uses: shivammathur/setup-php@master
|
||||||
with:
|
with:
|
||||||
|
|
@ -149,7 +149,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
fetch-depth: 1
|
fetch-depth: 1
|
||||||
ref: develop
|
ref: develop
|
||||||
repository: Orange-Management/Build
|
repository: Karaka/Build
|
||||||
path: Build
|
path: Build
|
||||||
- name: Setup PHP, with composer and extensions
|
- name: Setup PHP, with composer and extensions
|
||||||
uses: shivammathur/setup-php@master
|
uses: shivammathur/setup-php@master
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
## Code Style & Best Practices
|
## Code Style & Best Practices
|
||||||
|
|
||||||
For the code style and best practices please have a look at the developer-guide [https://github.comkaraka-management/Developer-Guide](https://github.comkaraka-management/Developer-Guide). Especially the `standards` should be followed for a successful pull request.
|
For the code style and best practices please have a look at the developer-guide [https://github.com/karaka-management/Developer-Guide](https://github.com/karaka-management/Developer-Guide). Especially the `standards` should be followed for a successful pull request.
|
||||||
|
|
||||||
## How Can I Contribute
|
## How Can I Contribute
|
||||||
|
|
||||||
|
|
@ -12,7 +12,7 @@ If you have a good idea for improvement feel free to create a new issue with all
|
||||||
|
|
||||||
### Issues
|
### Issues
|
||||||
|
|
||||||
Feel free to grab any open issue implement it and create a new pull request. Most issues can be found in the code marked with `@todo` or in the [PROJECT.md](https://github.comkaraka-management/Docs/blob/master/Project/PROJECT.md) file.
|
Feel free to grab any open issue implement it and create a new pull request. Most issues can be found in the code marked with `@todo` or in the [PROJECT.md](https://github.com/karaka-management/Docs/blob/master/Project/PROJECT.md) file.
|
||||||
|
|
||||||
### Code Style
|
### Code Style
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -226,7 +226,7 @@ final class ApiController extends Controller
|
||||||
$resetLink = UriFactory::build('{/backend}reset?user=' . $account->getId() . '&token=' . $token);
|
$resetLink = UriFactory::build('{/backend}reset?user=' . $account->getId() . '&token=' . $token);
|
||||||
|
|
||||||
$mail = new Email();
|
$mail = new Email();
|
||||||
$mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR], 'Orange-Management');
|
$mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR], 'Karaka');
|
||||||
$mail->addTo($account->email, \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3));
|
$mail->addTo($account->email, \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3));
|
||||||
$mail->subject = 'Karaka: Forgot Password';
|
$mail->subject = 'Karaka: Forgot Password';
|
||||||
$mail->body = '';
|
$mail->body = '';
|
||||||
|
|
@ -331,7 +331,7 @@ final class ApiController extends Controller
|
||||||
$loginLink = UriFactory::build('{/backend}');
|
$loginLink = UriFactory::build('{/backend}');
|
||||||
|
|
||||||
$mail = new Email();
|
$mail = new Email();
|
||||||
$mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR], 'Orange-Management');
|
$mail->setFrom($emailSettings[SettingsEnum::MAIL_SERVER_ADDR], 'Karaka');
|
||||||
$mail->addTo($account->email, \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3));
|
$mail->addTo($account->email, \trim($account->name1 . ' ' . $account->name2 . ' ' . $account->name3));
|
||||||
$mail->subject = 'Karaka: Password reset';
|
$mail->subject = 'Karaka: Password reset';
|
||||||
$mail->body = '';
|
$mail->body = '';
|
||||||
|
|
@ -1860,7 +1860,7 @@ final class ApiController extends Controller
|
||||||
public function apiCheckForUpdates(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
|
public function apiCheckForUpdates(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
|
||||||
{
|
{
|
||||||
// this is only a temp... in the future this logic will change but for current purposes this is the easiest way to implement updates
|
// this is only a temp... in the future this logic will change but for current purposes this is the easiest way to implement updates
|
||||||
$request = new HttpRequest(new HttpUri('https://api.github.com/repos/Orange-Management/Updates/contents'));
|
$request = new HttpRequest(new HttpUri('https://api.github.com/repos/Karaka/Updates/contents'));
|
||||||
$request->setMethod(RequestMethod::GET);
|
$request->setMethod(RequestMethod::GET);
|
||||||
$request->header->set('User-Agent', 'spl1nes');
|
$request->header->set('User-Agent', 'spl1nes');
|
||||||
|
|
||||||
|
|
@ -1913,7 +1913,7 @@ final class ApiController extends Controller
|
||||||
{
|
{
|
||||||
$this->apiUpdate([[
|
$this->apiUpdate([[
|
||||||
'name' => 'temp.json',
|
'name' => 'temp.json',
|
||||||
'download_url' => 'https://raw.githubusercontent.com/Orange-Management/' . ($request->getData('url') ?? ''),
|
'download_url' => 'https://raw.githubusercontent.com/Karaka-Management/' . ($request->getData('url') ?? ''),
|
||||||
]]);
|
]]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ final class Autoloader
|
||||||
*/
|
*/
|
||||||
private static $paths = [
|
private static $paths = [
|
||||||
__DIR__ . '/../',
|
__DIR__ . '/../',
|
||||||
__DIR__ . '/../Orange-Management/',
|
__DIR__ . '/../Karaka/',
|
||||||
__DIR__ . '/../../',
|
__DIR__ . '/../../',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@
|
||||||
</coverage>
|
</coverage>
|
||||||
<testsuites>
|
<testsuites>
|
||||||
<testsuite name="Install">
|
<testsuite name="Install">
|
||||||
<directory>../Orange-Management/Install/tests*</directory>
|
<directory>../Karaka/Install/tests*</directory>
|
||||||
</testsuite>
|
</testsuite>
|
||||||
<testsuite name="Module">
|
<testsuite name="Module">
|
||||||
<directory>../tests*</directory>
|
<directory>../tests*</directory>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user