thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  Password reset verbiage
This commit is contained in:
Matthew Dillon 2015-11-17 09:20:25 -07:00
commit 74e901380e
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/pods/components/x-application/component.js
View file

@ -1,10 +1,12 @@
import Ember from 'ember'; import Ember from 'ember';
export default Ember.Component.extend({ const { Component, inject: { service } } = Ember;
export default Component.extend({
classNames: ["flakes-frame"], classNames: ["flakes-frame"],
session: Ember.inject.service('session'), session: service(),
currentUser: Ember.inject.service('session-account'), currentUser: service('session-account'),
didInsertElement: function() { didInsertElement: function() {
FlakesFrame.init(); FlakesFrame.init();

2
app/pods/components/x-application/template.hbs
View file

@ -33,7 +33,7 @@
<br> <br>
{{link-to 'Sign Up' 'users.new'}} {{link-to 'Sign Up' 'users.new'}}
<br> <br>
{{link-to 'Locked Out?' 'users.requestlockouthelp'}} {{link-to 'Reset Password' 'users.requestlockouthelp'}}
</p> </p>
{{/if}} {{/if}}
</div> </div>