Merge branch 'dev' into issue-1639-email-reg-header
Conflicts: lib/email.js
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- bin/dbwriter 14 additions, 1 deletionbin/dbwriter
- lib/email.js 24 additions, 10 deletionslib/email.js
- lib/static/views.js 1 addition, 5 deletionslib/static/views.js
- lib/static_resources.js 0 additions, 1 deletionlib/static_resources.js
- package.json 3 additions, 3 deletionspackage.json
- resources/email_templates/confirm.ejs 0 additions, 0 deletionsresources/email_templates/confirm.ejs
- resources/email_templates/confirm.html.ejs 103 additions, 0 deletionsresources/email_templates/confirm.html.ejs
- resources/email_templates/new.ejs 0 additions, 0 deletionsresources/email_templates/new.ejs
- resources/email_templates/new.html.ejs 103 additions, 0 deletionsresources/email_templates/new.html.ejs
- resources/email_templates/reset.ejs 0 additions, 0 deletionsresources/email_templates/reset.ejs
- resources/email_templates/reset.html.ejs 103 additions, 0 deletionsresources/email_templates/reset.html.ejs
- resources/static/common/css/style.css 36 additions, 1 deletionresources/static/common/css/style.css
- resources/static/common/js/lib/dom-jquery.js 40 additions, 0 deletionsresources/static/common/js/lib/dom-jquery.js
- resources/static/common/js/lib/winchan.js 4 additions, 1 deletionresources/static/common/js/lib/winchan.js
- resources/static/common/js/models/interaction_data.js 2 additions, 2 deletionsresources/static/common/js/models/interaction_data.js
- resources/static/common/js/user.js 17 additions, 9 deletionsresources/static/common/js/user.js
- resources/static/communication_iframe/start.js 9 additions, 0 deletionsresources/static/communication_iframe/start.js
- resources/static/dialog/css/style.css 1 addition, 5 deletionsresources/static/dialog/css/style.css
- resources/static/dialog/js/misc/state.js 2 additions, 2 deletionsresources/static/dialog/js/misc/state.js
Loading
Please register or sign in to comment