skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Merge branch 'master' of github.com:Lyndir/MasterPassword

Browse Source
This commit is contained in:
Maarten Billemont
2014-11-17 20:15:50 -05:00
parent 395f7c71a2 574f239545
commit 00033eca37
8 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Site/mpw-js/css/main.css
View File

@@ -1,4 +1,4 @@
@import url(http://fonts.googleapis.com/css?family=Flamenco:300|Exo+2:400,100,900);
@import url(://fonts.googleapis.com/css?family=Flamenco:300|Exo+2:400,100,900);
/**** BASE STYLE ****/
html {

2
Site/mpw-js/js/dependencies.js
View File

@@ -37,7 +37,7 @@ try {
ES6 || document.write("<script src=js/mpw-js/traceur-runtime.js><\/script>");
// If setImmediate is not implemented we include the polyfill
window.setImmediate || document.write("<script src=js/" + esdir + "setImmediate-polyfill.js><\/script>");
window.setImmediate || document.write("<script src=js/mpw-js/" + esdir + "setImmediate-polyfill.js><\/script>");
// Include the scrypt implementation
var SCRYPTASM_PATH = (window.location + '').replace(/[^/]*(#[^#]*)?$/, 'js/mpw-js/scrypt-asm.js');

6
Site/mpw-js/sync Executable file
View File

@@ -0,0 +1,6 @@
#!/usr/bin/env bash
set -e
cd "${BASH_SOURCE[0]%/*}"
#s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://js.masterpasswordapp.com/
rsync -avP --no-group . satura.lyndir.com:/usr/local/www/js.masterpasswordapp.com/htdocs-secure/