Skip to content

Commit

Permalink
Merge pull request userfrosting#959 from userfrosting/feature-docker-…
Browse files Browse the repository at this point in the history
…refinements

Removed build containers from `docker-compose.yml` in favour of separate commands
  • Loading branch information
Silic0nS0ldier authored May 26, 2019
2 parents adec2ed + 1da7d3c commit aabe7ce
Show file tree
Hide file tree
Showing 24 changed files with 524 additions and 482 deletions.
61 changes: 61 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Configuration for probot-stale - https://github.com/probot/stale

# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 550

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 7

# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
onlyLabels: []

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels:
- "confirmed bug"
- security
- "long-range planning"

# Set to true to ignore issues in a project (defaults to false)
exemptProjects: false

# Set to true to ignore issues in a milestone (defaults to false)
exemptMilestones: true

# Set to true to ignore issues with an assignee (defaults to false)
exemptAssignees: false

# Label to use when marking as stale
staleLabel: wontfix

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when removing the stale label.
# unmarkComment: >
# Your comment here.

# Comment to post when closing a stale Issue or Pull Request.
# closeComment: >
# Your comment here.

# Limit the number of actions per hour, from 1-30. Default is 30
limitPerRun: 30

# Limit to only `issues` or `pulls`
# only: issues

# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
# pulls:
# daysUntilStale: 30
# markComment: >
# This pull request has been automatically marked as stale because it has not had
# recent activity. It will be closed if no further activity occurs. Thank you
# for your contributions.

# issues:
# exemptLabels:
# - confirmed
284 changes: 143 additions & 141 deletions app/sprinkles/account/locale/el/messages.php

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions app/sprinkles/account/locale/el/validate.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<?php

/**
* UserFrosting (http://www.userfrosting.com)
*
* @link https://github.com/userfrosting/UserFrosting
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
*
* @copyright Copyright (c) 2019 Alexander Weissman
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
*/

/**
* Greek message token translations for the 'account' sprinkle.
*
* @package userfrosting\i18n\el
* @author Lena Stergatou
* @author Lena Stergatou (lenasterg)
*/

return [
"VALIDATE" => [
"PASSWORD_MISMATCH" => "Ο κωδικός πρόσβασής σας και ο κωδικός επιβεβαίωσης πρέπει να ταιριάζουν",
"USERNAME" => "Το όνομα χρήστη μπορεί να αποτελείται μόνο από πεζά γράμματα, αριθμούς, '.', '-', and '_'."
'VALIDATE' => [
'PASSWORD_MISMATCH' => 'Ο κωδικός πρόσβασής σας και ο κωδικός επιβεβαίωσης πρέπει να ταιριάζουν',
'USERNAME' => "Το όνομα χρήστη μπορεί να αποτελείται μόνο από πεζά γράμματα, αριθμούς, '.', '-', and '_'."
]
];
4 changes: 2 additions & 2 deletions app/sprinkles/account/src/Controller/AccountController.php
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ public function pageRegister(Request $request, Response $response, $args)
'register' => $validatorRegister->rules('json', false)
]
],
'fields' => $fields,
'fields' => $fields,
'locales' => [
'available' => $config['site.locales.available'],
'current' => end($currentLocales)
Expand Down Expand Up @@ -679,7 +679,7 @@ public function pageSettings(Request $request, Response $response, $args)

return $this->ci->view->render($response, 'pages/account-settings.html.twig', [
'locales' => $locales,
'fields' => $fields,
'fields' => $fields,
'page' => [
'validators' => [
'account_settings' => $validatorAccountSettings->rules('json', false),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function testUserHardDeleteWithUserRelations()
$this->assertInstanceOf(User::class, User::withTrashed()->find($user->id));

//$user->activities - activities
$this->ci->userActivityLogger->info("test", [
$this->ci->userActivityLogger->info('test', [
'type' => 'group_create',
'user_id' => $user->id
]);
Expand Down
Loading

0 comments on commit aabe7ce

Please sign in to comment.