From b155a01b5fa12edbad21698ad98ceef98ad416c6 Mon Sep 17 00:00:00 2001 From: Maksim Knyshov Date: Tue, 31 Mar 2015 22:38:15 +0300 Subject: [PATCH 1/4] Remove unneeded .gitkeep's --- framework/core/ember/admin/app/controllers/.gitkeep | 0 framework/core/ember/admin/app/styles/.gitkeep | 0 framework/core/ember/admin/app/templates/.gitkeep | 0 framework/core/ember/admin/app/views/.gitkeep | 0 framework/core/ember/common/app/.gitkeep | 0 framework/core/ember/common/app/helpers/.gitkeep | 0 framework/core/ember/common/app/models/.gitkeep | 0 framework/core/ember/common/app/utils/.gitkeep | 0 framework/core/ember/forum/app/controllers/.gitkeep | 0 framework/core/ember/forum/app/routes/.gitkeep | 0 framework/core/ember/forum/app/templates/.gitkeep | 0 framework/core/ember/forum/app/templates/components/.gitkeep | 0 framework/core/ember/forum/app/views/.gitkeep | 0 framework/core/less/.gitkeep | 0 framework/core/tests/.gitkeep | 0 framework/core/views/.gitkeep | 0 16 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 framework/core/ember/admin/app/controllers/.gitkeep delete mode 100644 framework/core/ember/admin/app/styles/.gitkeep delete mode 100644 framework/core/ember/admin/app/templates/.gitkeep delete mode 100644 framework/core/ember/admin/app/views/.gitkeep delete mode 100644 framework/core/ember/common/app/.gitkeep delete mode 100644 framework/core/ember/common/app/helpers/.gitkeep delete mode 100644 framework/core/ember/common/app/models/.gitkeep delete mode 100644 framework/core/ember/common/app/utils/.gitkeep delete mode 100644 framework/core/ember/forum/app/controllers/.gitkeep delete mode 100644 framework/core/ember/forum/app/routes/.gitkeep delete mode 100644 framework/core/ember/forum/app/templates/.gitkeep delete mode 100644 framework/core/ember/forum/app/templates/components/.gitkeep delete mode 100644 framework/core/ember/forum/app/views/.gitkeep delete mode 100644 framework/core/less/.gitkeep delete mode 100644 framework/core/tests/.gitkeep delete mode 100644 framework/core/views/.gitkeep diff --git a/framework/core/ember/admin/app/controllers/.gitkeep b/framework/core/ember/admin/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/admin/app/styles/.gitkeep b/framework/core/ember/admin/app/styles/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/admin/app/templates/.gitkeep b/framework/core/ember/admin/app/templates/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/admin/app/views/.gitkeep b/framework/core/ember/admin/app/views/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/common/app/.gitkeep b/framework/core/ember/common/app/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/common/app/helpers/.gitkeep b/framework/core/ember/common/app/helpers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/common/app/models/.gitkeep b/framework/core/ember/common/app/models/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/common/app/utils/.gitkeep b/framework/core/ember/common/app/utils/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/forum/app/controllers/.gitkeep b/framework/core/ember/forum/app/controllers/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/forum/app/routes/.gitkeep b/framework/core/ember/forum/app/routes/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/forum/app/templates/.gitkeep b/framework/core/ember/forum/app/templates/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/forum/app/templates/components/.gitkeep b/framework/core/ember/forum/app/templates/components/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/ember/forum/app/views/.gitkeep b/framework/core/ember/forum/app/views/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/less/.gitkeep b/framework/core/less/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/tests/.gitkeep b/framework/core/tests/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/framework/core/views/.gitkeep b/framework/core/views/.gitkeep deleted file mode 100644 index e69de29bb..000000000 From 243ad08fd8c28b8dce58e4c02ca4b09468dc34f6 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 15 Apr 2015 13:44:35 +0200 Subject: [PATCH 2/4] Fix class name conflict. --- framework/core/src/Core/Models/RegisteredTypesScope.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/core/src/Core/Models/RegisteredTypesScope.php b/framework/core/src/Core/Models/RegisteredTypesScope.php index 5dad574c4..24f579d74 100644 --- a/framework/core/src/Core/Models/RegisteredTypesScope.php +++ b/framework/core/src/Core/Models/RegisteredTypesScope.php @@ -2,7 +2,7 @@ use Illuminate\Database\Eloquent\ScopeInterface; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Model as Eloquent; class RegisteredTypesScope implements ScopeInterface { @@ -34,7 +34,7 @@ class RegisteredTypesScope implements ScopeInterface * @param \Illuminate\Database\Eloquent\Model $model * @return void */ - public function apply(Builder $builder, Model $model) + public function apply(Builder $builder, Eloquent $model) { $query = $builder->getQuery(); @@ -53,7 +53,7 @@ class RegisteredTypesScope implements ScopeInterface * @param \Illuminate\Database\Eloquent\Model $model * @return void */ - public function remove(Builder $builder, Model $model) + public function remove(Builder $builder, Eloquent $model) { $query = $builder->getQuery(); From e52dfb92de0e7765dd750c7272603037e8eb2d1a Mon Sep 17 00:00:00 2001 From: Rodrigo Argumedo Date: Fri, 17 Apr 2015 17:49:41 -0600 Subject: [PATCH 3/4] Added a note where if users.. did not sign up with Flarum. --- framework/core/views/emails/confirm.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/core/views/emails/confirm.blade.php b/framework/core/views/emails/confirm.blade.php index 7a6577e6d..75f9d2b3f 100644 --- a/framework/core/views/emails/confirm.blade.php +++ b/framework/core/views/emails/confirm.blade.php @@ -4,3 +4,5 @@ Someone (hopefully you!) has signed up to the forum '{{ $forumTitle }}' with thi If this was you, simply visit the following link and your account will be activated: {{ $url }} + +If you did not sign up, just simply ignore this email. From b8e2933479219c5850ba52f0c985d4f979196dd9 Mon Sep 17 00:00:00 2001 From: Rodrigo Argumedo Date: Mon, 20 Apr 2015 10:23:33 -0600 Subject: [PATCH 4/4] Update wording of the confirmation email --- framework/core/views/emails/confirm.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/core/views/emails/confirm.blade.php b/framework/core/views/emails/confirm.blade.php index 75f9d2b3f..5daff5fef 100644 --- a/framework/core/views/emails/confirm.blade.php +++ b/framework/core/views/emails/confirm.blade.php @@ -5,4 +5,5 @@ Someone (hopefully you!) has signed up to the forum '{{ $forumTitle }}' with thi If this was you, simply visit the following link and your account will be activated: {{ $url }} -If you did not sign up, just simply ignore this email. +If you did not sign up, please ignore this email. +