Skip to content

Commit aabe7ce

Browse files
Merge pull request #959 from userfrosting/feature-docker-refinements
Removed build containers from `docker-compose.yml` in favour of separate commands
2 parents adec2ed + 1da7d3c commit aabe7ce

24 files changed

Lines changed: 524 additions & 482 deletions

File tree

.github/stale.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
# Configuration for probot-stale - https://github.com/probot/stale
2+
3+
# Number of days of inactivity before an Issue or Pull Request becomes stale
4+
daysUntilStale: 550
5+
6+
# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
7+
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
8+
daysUntilClose: 7
9+
10+
# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
11+
onlyLabels: []
12+
13+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
14+
exemptLabels:
15+
- "confirmed bug"
16+
- security
17+
- "long-range planning"
18+
19+
# Set to true to ignore issues in a project (defaults to false)
20+
exemptProjects: false
21+
22+
# Set to true to ignore issues in a milestone (defaults to false)
23+
exemptMilestones: true
24+
25+
# Set to true to ignore issues with an assignee (defaults to false)
26+
exemptAssignees: false
27+
28+
# Label to use when marking as stale
29+
staleLabel: wontfix
30+
31+
# Comment to post when marking as stale. Set to `false` to disable
32+
markComment: >
33+
This issue has been automatically marked as stale because it has not had
34+
recent activity. It will be closed if no further activity occurs. Thank you
35+
for your contributions.
36+
37+
# Comment to post when removing the stale label.
38+
# unmarkComment: >
39+
# Your comment here.
40+
41+
# Comment to post when closing a stale Issue or Pull Request.
42+
# closeComment: >
43+
# Your comment here.
44+
45+
# Limit the number of actions per hour, from 1-30. Default is 30
46+
limitPerRun: 30
47+
48+
# Limit to only `issues` or `pulls`
49+
# only: issues
50+
51+
# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
52+
# pulls:
53+
# daysUntilStale: 30
54+
# markComment: >
55+
# This pull request has been automatically marked as stale because it has not had
56+
# recent activity. It will be closed if no further activity occurs. Thank you
57+
# for your contributions.
58+
59+
# issues:
60+
# exemptLabels:
61+
# - confirmed

app/sprinkles/account/locale/el/messages.php

Lines changed: 143 additions & 141 deletions
Large diffs are not rendered by default.
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
<?php
2-
32
/**
43
* UserFrosting (http://www.userfrosting.com)
54
*
65
* @link https://github.com/userfrosting/UserFrosting
7-
* @license https://github.com/userfrosting/UserFrosting/blob/master/licenses/UserFrosting.md (MIT License)
8-
*
6+
* @copyright Copyright (c) 2019 Alexander Weissman
7+
* @license https://github.com/userfrosting/UserFrosting/blob/master/LICENSE.md (MIT License)
8+
*/
9+
10+
/**
911
* Greek message token translations for the 'account' sprinkle.
1012
*
11-
* @package userfrosting\i18n\el
12-
* @author Lena Stergatou
13+
* @author Lena Stergatou (lenasterg)
1314
*/
1415

1516
return [
16-
"VALIDATE" => [
17-
"PASSWORD_MISMATCH" => "Ο κωδικός πρόσβασής σας και ο κωδικός επιβεβαίωσης πρέπει να ταιριάζουν",
18-
"USERNAME" => "Το όνομα χρήστη μπορεί να αποτελείται μόνο από πεζά γράμματα, αριθμούς, '.', '-', and '_'."
17+
'VALIDATE' => [
18+
'PASSWORD_MISMATCH' => 'Ο κωδικός πρόσβασής σας και ο κωδικός επιβεβαίωσης πρέπει να ταιριάζουν',
19+
'USERNAME' => "Το όνομα χρήστη μπορεί να αποτελείται μόνο από πεζά γράμματα, αριθμούς, '.', '-', and '_'."
1920
]
2021
];

app/sprinkles/account/src/Controller/AccountController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ public function pageRegister(Request $request, Response $response, $args)
524524
'register' => $validatorRegister->rules('json', false)
525525
]
526526
],
527-
'fields' => $fields,
527+
'fields' => $fields,
528528
'locales' => [
529529
'available' => $config['site.locales.available'],
530530
'current' => end($currentLocales)
@@ -679,7 +679,7 @@ public function pageSettings(Request $request, Response $response, $args)
679679

680680
return $this->ci->view->render($response, 'pages/account-settings.html.twig', [
681681
'locales' => $locales,
682-
'fields' => $fields,
682+
'fields' => $fields,
683683
'page' => [
684684
'validators' => [
685685
'account_settings' => $validatorAccountSettings->rules('json', false),

app/sprinkles/account/tests/Integration/Database/Models/UserModelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function testUserHardDeleteWithUserRelations()
5454
$this->assertInstanceOf(User::class, User::withTrashed()->find($user->id));
5555

5656
//$user->activities - activities
57-
$this->ci->userActivityLogger->info("test", [
57+
$this->ci->userActivityLogger->info('test', [
5858
'type' => 'group_create',
5959
'user_id' => $user->id
6060
]);

0 commit comments

Comments
 (0)