From bcf0ca083f9048e104291b17a5a5006a3ffa28fa Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Thu, 21 Aug 2014 11:31:20 +0100
Subject: [PATCH 01/11] Fix for #221

Fix for Issue #221
"Match failed" error after creating user if passwordSignupFields is set
to 'USERNAME_ONLY'

https://github.com/Differential/accounts-entry/issues/221
---
 server/entry.coffee | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/server/entry.coffee b/server/entry.coffee
index fd467daf..819914e0 100644
--- a/server/entry.coffee
+++ b/server/entry.coffee
@@ -18,13 +18,21 @@ Meteor.startup ->
     entryCreateUser: (user) ->
       check user, Object
       profile = AccountsEntry.settings.defaultProfile || {}
-      if user.username
+      # both username & email provided
+      if user.username && user.email
         userId = Accounts.createUser
           username: user.username,
           email: user.email,
           password: user.password,
           profile: _.extend(profile, user.profile)
-      else
+      # only username provided
+      else if user.username && !user.email
+        userId = Accounts.createUser
+          username: user.username,
+          password: user.password,
+          profile: _.extend(profile, user.profile)
+      # only email provided
+      else if user.email && !user.username
         userId = Accounts.createUser
           email: user.email
           password: user.password

From 7d3eadbe581e47e044f2a6691c6d43a9c1c36203 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Thu, 21 Aug 2014 11:36:46 +0100
Subject: [PATCH 02/11] Fix for #229

Fix for #229
No submission button on sign-in page?
---
 client/views/signIn/signIn.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/signIn/signIn.html b/client/views/signIn/signIn.html
index 174a087e..fbc7a025 100644
--- a/client/views/signIn/signIn.html
+++ b/client/views/signIn/signIn.html
@@ -35,8 +35,8 @@ <h3>{{t9n "signIn"}}</h3>
             </div>
             {{#unless isUsernameOnly}}
               <p><a href="{{pathFor 'entryForgotPassword'}}">{{t9n "forgotPassword"}}</a></p>
-              <button type="submit" class="submit btn btn-block btn-default">{{t9n "signIn"}}</button>
             {{/unless}}
+		    <button type="submit" class="submit btn btn-block btn-default">{{t9n "signIn"}}</button>
           </form>
         {{/if}}
         {{#if showCreateAccountLink}}

From 3a95dfd72ce9f1b0727aaf9719574aa89130bc09 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 10:48:34 +0100
Subject: [PATCH 03/11] t9n "OR"

---
 client/views/signUp/signUp.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/signUp/signUp.html b/client/views/signUp/signUp.html
index 6b1d1132..b2a693c0 100644
--- a/client/views/signUp/signUp.html
+++ b/client/views/signUp/signUp.html
@@ -16,7 +16,7 @@ <h3>{{t9n "createAccount"}}</h3>
             {{/each}}
             {{#if passwordLoginService}}
               <div class="email-option">
-                <strong class="line-thru">OR</strong>
+                <strong class="line-thru">{{t9n "OR"}}</strong>
                 <a data-toggle="collapse" href="#signUp">
                   {{t9n "signUpWithYourEmailAddress"}}
                 </a>

From df10a42550cfcfb210da3318ad489f272f62d862 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 10:52:45 +0100
Subject: [PATCH 04/11] Template fixes

---
 client/views/signIn/signIn.coffee | 2 +-
 client/views/signUp/signUp.html   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/views/signIn/signIn.coffee b/client/views/signIn/signIn.coffee
index 96bfb682..77d167c9 100644
--- a/client/views/signIn/signIn.coffee
+++ b/client/views/signIn/signIn.coffee
@@ -3,7 +3,7 @@ AccountsEntry.entrySignInHelpers = {
     if AccountsEntry.settings.passwordSignupFields is 'EMAIL_ONLY'
       'email'
     else
-      'string'
+      'text'
 
   emailPlaceholder: ->
     fields = AccountsEntry.settings.passwordSignupFields
diff --git a/client/views/signUp/signUp.html b/client/views/signUp/signUp.html
index b2a693c0..79869d98 100644
--- a/client/views/signUp/signUp.html
+++ b/client/views/signUp/signUp.html
@@ -32,7 +32,7 @@ <h3>{{t9n "createAccount"}}</h3>
             {{#if showUsername}}
               <div class="form-group">
                 <label>{{t9n "username"}}</label>
-                <input autofocus name="username" type="string" class="form-control" value=''>
+                <input autofocus name="username" type="text" class="form-control" value='' placeholder="{{t9n 'username'}}">
               </div>
             {{/if}}
 
@@ -40,16 +40,16 @@ <h3>{{t9n "createAccount"}}</h3>
               <div class="form-group">
                 <label>{{t9n "emailAddress"}}</label>
                 {{#if showUsername}}
-                  <input type="email" class="form-control" value='{{emailAddress}}'>
+                  <input type="email" class="form-control" value='{{emailAddress}}' placeholder="{{t9n 'email'}}">
                 {{else}}
-                  <input autofocus type="email" class="form-control" value='{{emailAddress}}'>
+                  <input autofocus type="email" class="form-control" value='{{emailAddress}}' placeholder="{{t9n 'email'}}">
                 {{/if}}
               </div>
             {{/if}}
 
             <div class="form-group">
               <label>{{t9n "password"}}</label>
-              <input type="password" class="form-control" value=''>
+              <input type="password" class="form-control" value='' placeholder="{{t9n 'password'}}">
             </div>
 
             {{#if showSignupCode}}

From 211b7988c1fdd1ec5d949893718131a254578419 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 10:53:32 +0100
Subject: [PATCH 05/11] Compatibility with Meteor 0.9.0

---
 package.js    |  18 +++--
 versions.json | 207 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 218 insertions(+), 7 deletions(-)
 create mode 100644 versions.json

diff --git a/package.js b/package.js
index 3017d93a..9e5fa25c 100644
--- a/package.js
+++ b/package.js
@@ -1,9 +1,13 @@
 Package.describe({
-    summary: "Make signin and signout their own pages with routes."
+    summary: "Make signin and signout their own pages with routes.",
+    version: '0.9.0',
+    git: 'https://github.com/nunohvidal/accounts-entry'
 });
 
-Package.on_use(function(api) {
+Package.onUse(function(api) {
+  api.versionsFrom("METEOR@0.9.0");
 
+  api.use(['iron:router', 'mrt:accounts-t9n'], ['client', 'server']);
   // CLIENT
   api.use([
     'deps',
@@ -20,7 +24,7 @@ Package.on_use(function(api) {
   , 'client');
 
 
-  api.add_files([
+  api.addFiles([
     'client/entry.coffee',
     'client/entry.less',
     'client/helpers.coffee',
@@ -65,7 +69,7 @@ Package.on_use(function(api) {
     'coffeescript'
   ], 'server');
 
-  api.add_files(['server/entry.coffee'], 'server');
+  api.addFiles(['server/entry.coffee'], 'server');
 
   // CLIENT and SERVER
   api.imply('accounts-base', ['client', 'server']);
@@ -73,11 +77,11 @@ Package.on_use(function(api) {
   api.export('AccountsEntry', ['client', 'server']);
   api.use('iron-router', ['client', 'server']);
   api.use(['accounts-t9n'], ['client', 'server']);
-  api.add_files(['shared/router.coffee'], ['client', 'server']);
+  api.addFiles(['shared/router.coffee'], ['client', 'server']);
 
 });
 
-Package.on_test(function (api) {
+Package.onTest(function (api) {
   api.use(['tinytest',
             'underscore',
             'handlebars',
@@ -89,5 +93,5 @@ Package.on_test(function (api) {
             'iron-router']);
   api.use('accounts-entry');
 
-  api.add_files(['tests/route.coffee', 'tests/client.html', 'tests/client.coffee'], 'client');
+  api.addFiles(['tests/route.coffee', 'tests/client.html', 'tests/client.coffee'], 'client');
 })
diff --git a/versions.json b/versions.json
new file mode 100644
index 00000000..ce24090b
--- /dev/null
+++ b/versions.json
@@ -0,0 +1,207 @@
+{
+  "dependencies": [
+    [
+      "accounts-base",
+      "1.0.0"
+    ],
+    [
+      "accounts-password",
+      "1.0.0"
+    ],
+    [
+      "accounts-t9n",
+      "0.0.0"
+    ],
+    [
+      "application-configuration",
+      "1.0.0"
+    ],
+    [
+      "binary-heap",
+      "1.0.0"
+    ],
+    [
+      "blaze",
+      "1.0.2"
+    ],
+    [
+      "blaze-layout",
+      "0.0.0"
+    ],
+    [
+      "blaze-tools",
+      "1.0.0"
+    ],
+    [
+      "callback-hook",
+      "1.0.0"
+    ],
+    [
+      "check",
+      "1.0.0"
+    ],
+    [
+      "coffeescript",
+      "1.0.2"
+    ],
+    [
+      "deps",
+      "1.0.0"
+    ],
+    [
+      "ejson",
+      "1.0.0"
+    ],
+    [
+      "email",
+      "1.0.2"
+    ],
+    [
+      "follower-livedata",
+      "1.0.0"
+    ],
+    [
+      "geojson-utils",
+      "1.0.0"
+    ],
+    [
+      "handlebars",
+      "1.0.0"
+    ],
+    [
+      "html-tools",
+      "1.0.0"
+    ],
+    [
+      "htmljs",
+      "1.0.0"
+    ],
+    [
+      "id-map",
+      "1.0.0"
+    ],
+    [
+      "iron-router",
+      "0.0.0"
+    ],
+    [
+      "jquery",
+      "1.0.0"
+    ],
+    [
+      "json",
+      "1.0.0"
+    ],
+    [
+      "less",
+      "1.0.4"
+    ],
+    [
+      "livedata",
+      "1.0.4"
+    ],
+    [
+      "localstorage",
+      "1.0.0"
+    ],
+    [
+      "logging",
+      "1.0.2"
+    ],
+    [
+      "meteor",
+      "1.0.2"
+    ],
+    [
+      "minifiers",
+      "1.0.2"
+    ],
+    [
+      "minimongo",
+      "1.0.1"
+    ],
+    [
+      "mongo-livedata",
+      "1.0.2"
+    ],
+    [
+      "npm-bcrypt",
+      "0.7.7"
+    ],
+    [
+      "observe-sequence",
+      "1.0.1"
+    ],
+    [
+      "ordered-dict",
+      "1.0.0"
+    ],
+    [
+      "random",
+      "1.0.0"
+    ],
+    [
+      "reactive-dict",
+      "1.0.0"
+    ],
+    [
+      "retry",
+      "1.0.0"
+    ],
+    [
+      "routepolicy",
+      "1.0.0"
+    ],
+    [
+      "service-configuration",
+      "1.0.0"
+    ],
+    [
+      "session",
+      "1.0.0"
+    ],
+    [
+      "sha",
+      "1.0.0"
+    ],
+    [
+      "simple-form",
+      "0.0.0"
+    ],
+    [
+      "spacebars",
+      "1.0.0"
+    ],
+    [
+      "spacebars-compiler",
+      "1.0.1"
+    ],
+    [
+      "srp",
+      "1.0.0"
+    ],
+    [
+      "templating",
+      "1.0.4"
+    ],
+    [
+      "ui",
+      "1.0.0"
+    ],
+    [
+      "underscore",
+      "1.0.0"
+    ],
+    [
+      "underscore-string-latest",
+      "0.0.0"
+    ],
+    [
+      "webapp",
+      "1.0.2"
+    ]
+  ],
+  "pluginDependencies": [],
+  "toolVersion": "meteor-tool@1.0.12",
+  "format": "1.0"
+}
\ No newline at end of file

From 5fdfcc8391384149dad190496a967d44f799b023 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 12:43:37 +0100
Subject: [PATCH 06/11] Bump version & compatibility with Meteor 0.9.0

---
 package.js | 14 +++++++-------
 smart.json |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.js b/package.js
index 9e5fa25c..37454e23 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
     summary: "Make signin and signout their own pages with routes.",
-    version: '0.9.0',
+    version: '0.9.1',
     git: 'https://github.com/nunohvidal/accounts-entry'
 });
 
@@ -18,7 +18,7 @@ Package.onUse(function(api) {
     'handlebars',
     'session',
     'coffeescript',
-    'simple-form',
+    'joshowens:simple-form',
     'less',
     'sha']
   , 'client');
@@ -75,8 +75,8 @@ Package.onUse(function(api) {
   api.imply('accounts-base', ['client', 'server']);
   api.imply('accounts-password', ['client', 'server']);
   api.export('AccountsEntry', ['client', 'server']);
-  api.use('iron-router', ['client', 'server']);
-  api.use(['accounts-t9n'], ['client', 'server']);
+  api.use('iron:router', ['client', 'server']);
+  api.use(['mrt:accounts-t9n'], ['client', 'server']);
   api.addFiles(['shared/router.coffee'], ['client', 'server']);
 
 });
@@ -89,9 +89,9 @@ Package.onTest(function (api) {
             'templating',
             'mongo-livedata',
             'coffeescript',
-            'simple-form',
-            'iron-router']);
-  api.use('accounts-entry');
+            'joshownens:simple-form',
+            'iron:router']);
+  api.use('mrt:accounts-entry');
 
   api.addFiles(['tests/route.coffee', 'tests/client.html', 'tests/client.coffee'], 'client');
 })
diff --git a/smart.json b/smart.json
index 6556797a..08a9d2a2 100644
--- a/smart.json
+++ b/smart.json
@@ -4,10 +4,10 @@
   "homepage": "https://github.com/Differential/accounts-entry",
   "author": "Differential (http://differential.io)",
   "version": "0.8.1",
-  "git": "https://github.com/Differential/accounts-entry.git",
+  "git": "https://github.com/nunohvidal/accounts-entry.git",
   "packages": {
-    "iron-router": "0.8.2",
-    "accounts-t9n": "0.0.5",
-    "simple-form": ""
+    "iron:router": "0.9.0",
+    "mrt:accounts-t9n": "0.0.5",
+    "joshowens:simple-form": ""
   }
 }

From 27b5306f1146e00c575cffbe52be57fec37f708b Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 12:45:35 +0100
Subject: [PATCH 07/11] Test with meteor 0.9.0

---
 smart.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart.json b/smart.json
index 08a9d2a2..e0eb1db3 100644
--- a/smart.json
+++ b/smart.json
@@ -6,8 +6,8 @@
   "version": "0.8.1",
   "git": "https://github.com/nunohvidal/accounts-entry.git",
   "packages": {
-    "iron:router": "0.9.0",
-    "mrt:accounts-t9n": "0.0.5",
-    "joshowens:simple-form": ""
+    "iron-router": "0.8.2",
+    "accounts-t9n": "0.0.5",
+    "simple-form": ""
   }
 }

From edbc64fae4798dc4e825b5ae95cf09c8c2da0d21 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 12:47:12 +0100
Subject: [PATCH 08/11] Revert "Test with meteor 0.9.0"

This reverts commit 27b5306f1146e00c575cffbe52be57fec37f708b.
---
 smart.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart.json b/smart.json
index e0eb1db3..08a9d2a2 100644
--- a/smart.json
+++ b/smart.json
@@ -6,8 +6,8 @@
   "version": "0.8.1",
   "git": "https://github.com/nunohvidal/accounts-entry.git",
   "packages": {
-    "iron-router": "0.8.2",
-    "accounts-t9n": "0.0.5",
-    "simple-form": ""
+    "iron:router": "0.9.0",
+    "mrt:accounts-t9n": "0.0.5",
+    "joshowens:simple-form": ""
   }
 }

From c2fe00f6358ee6aa12b3a13b18d73aab24bc00f0 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 12:51:42 +0100
Subject: [PATCH 09/11] Another meteor 0.9.0 test

---
 smart.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart.json b/smart.json
index 08a9d2a2..9d1eddfe 100644
--- a/smart.json
+++ b/smart.json
@@ -1,13 +1,13 @@
 {
   "name": "accounts-entry",
   "description": "A meteorite package that relies on Iron Router and gives you whole-page login styles.",
-  "homepage": "https://github.com/Differential/accounts-entry",
+  "homepage": "https://github.com/nunohvidal/accounts-entry",
   "author": "Differential (http://differential.io)",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "git": "https://github.com/nunohvidal/accounts-entry.git",
   "packages": {
     "iron:router": "0.9.0",
-    "mrt:accounts-t9n": "0.0.5",
+    "mrt:accounts-t9n": "0.0.13",
     "joshowens:simple-form": ""
   }
 }

From bc6ce190e2c0b010376bbeff7b8550f29c1e15a8 Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Wed, 27 Aug 2014 12:53:16 +0100
Subject: [PATCH 10/11] yet

---
 smart.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/smart.json b/smart.json
index 9d1eddfe..9d4b264a 100644
--- a/smart.json
+++ b/smart.json
@@ -6,8 +6,8 @@
   "version": "0.9.1",
   "git": "https://github.com/nunohvidal/accounts-entry.git",
   "packages": {
-    "iron:router": "0.9.0",
-    "mrt:accounts-t9n": "0.0.13",
-    "joshowens:simple-form": ""
+    "iron-router": "",
+    "accounts-t9n": "",
+    "simple-form": ""
   }
 }

From 633f8c628e89f27aa2a675fb7cc94c1b0388807e Mon Sep 17 00:00:00 2001
From: nunohvidal <nuno.h.vidal@gmail.com>
Date: Thu, 28 Aug 2014 12:33:36 +0100
Subject: [PATCH 11/11]  Login Redirection Fix #231

fixes #239, #218, #247
---
 shared/router.coffee | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/shared/router.coffee b/shared/router.coffee
index 3e8458e9..e282e047 100644
--- a/shared/router.coffee
+++ b/shared/router.coffee
@@ -5,7 +5,6 @@ Router.map ->
     onBeforeAction: ->
       Session.set('entryError', undefined)
       Session.set('buttonText', 'in')
-      Session.set('fromWhere', Router.current().path)
     onRun: ->
       if Meteor.userId()
         Router.go AccountsEntry.settings.dashboardRoute
@@ -75,3 +74,14 @@ Router.map ->
     onBeforeAction: ->
       Session.set('entryError', undefined)
       Session.set('resetToken', @params.resetToken)
+
+# Get all the accounts-entry routes one time
+exclusions = [];
+_.each Router.routes, (route)->
+   exclusions.push route.name
+
+# Change the fromWhere session variable when you leave a path
+Router.onStop ->
+  # If the route is an entry route, no need to save it
+  if (!_.contains(exclusions, Router.current().route.name))
+    Session.set('fromWhere', Router.current().path)
\ No newline at end of file