Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
- when adding a partner you don't have to choose a name for it, as the public key already contains the name of it
- the way partners are added have been refactored
- the rsa key size is now set to 2048. Everything it more secure now (and takes longer ...)
- the private key and the partners are saved to local storage so you can keep your keys and partners
Merge branch 'master' into gh-pages
added a modal dialog asking for a name when you first open up the application
added error messages if a pgp-message could not be parsed or decrypted
Merge branch 'master' into gh-pages
The enter username window will now not close until you enter a username
Merge branch 'master' into gh-pages
added message that key generation may take some time and made the button getting disabled to indicate that keys are generating
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Removed the edit button since it makes no sence, you can only edit the public key and if you change it the name will also change
Merge branch 'master' into usingDebugPgpJs

Conflicts:
	index.html
	js/appEvents.js