bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2026-01-05 18:13:41 +00:00
Code Issues Releases Wiki Activity

accept org invite. return state for login

Browse Source
This commit is contained in:
Kyle Spearrin
2017-03-23 16:57:47 -04:00
parent 0b875fc6f7
commit 9f1ab6f961
7 changed files with 118 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/accounts/views/accountsRegister.html
View File

@@ -9,7 +9,7 @@
<h4>Account Created!</h4>
<p>You may now log in to your new account.</p>
</div>
<a ui-sref="frontend.login.info">Ready to log in?</a>
<a ui-sref="frontend.login.info({returnState: returnState})">Ready to log in?</a>
</div>
<form name="registerForm" ng-submit="registerForm.$valid && register(registerForm)" ng-show="!success"
api-form="registerPromise">
@@ -60,7 +60,7 @@
</div>
<div class="row">
<div class="col-xs-7">
<a ui-sref="frontend.login.info">Already have an account?</a>
<a ui-sref="frontend.login.info({returnState: returnState})">Already have an account?</a>
</div>
<div class="col-xs-5">
<button type="submit" class="btn btn-primary btn-block btn-flat" ng-disabled="registerForm.$loading">