Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SpiderOak/Encryptr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0-RC.1
Choose a base ref
...
head repository: SpiderOak/Encryptr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 20,969 additions and 15,151 deletions.
  1. +5 −0 .bowerrc
  2. +0 −65 .cordova/hooks/after_prepare/icons_and_splash.js
  3. +4 −0 .gitignore
  4. +6 −1 .jshintrc
  5. BIN AndroidIcon.png
  6. +89 −0 CCA.md
  7. +23 −0 CONTRIBUTING.md
  8. +77 −60 Gruntfile.js
  9. +26 −11 README.md
  10. +1 −1 bower.json
  11. +47 −0 build.sh
  12. +43 −0 config.xml
  13. +183 −87 functional-tests/functionalTests.js
  14. BIN iOSIcon.png
  15. +27 −20 package.json
  16. +6 −0 platforms/ios/Encryptr/Images.xcassets/Contents.json
  17. +175 −0 platforms/ios/Encryptr/Images.xcassets/Icons.appiconset/Contents.json
  18. BIN resources/Encryptr-bg.png
  19. BIN resources/Encryptr-bg@2x.png
  20. +23 −0 resources/Encryptr-linux.sh
  21. +69 −0 resources/Encryptr-win.wxs
  22. +1 −1 resources/Encryptr.json
  23. +9 −0 resources/GPLv3.rtf
  24. BIN resources/icon-encryptr.icns
  25. BIN resources/icon-encryptr.ico
  26. BIN resources/icon-encryptr.png
  27. +148 −3,525 resources/icon-encryptr.svg
  28. BIN resources/icons/android/res/drawable-hdpi/ic_launcher.png
  29. BIN resources/icons/android/res/drawable-ldpi/ic_launcher.png
  30. BIN resources/icons/android/res/drawable-mdpi/ic_launcher.png
  31. BIN resources/icons/android/res/drawable-xhdpi/ic_launcher.png
  32. BIN resources/icons/android/res/drawable-xxhdpi/ic_launcher.png
  33. BIN resources/icons/android/res/drawable-xxxhdpi/ic_launcher.png
  34. BIN resources/icons/android/web_hi_res_512.png
  35. BIN resources/icons/ios/app-icon-app-store.png
  36. BIN resources/icons/ios/app-icon-ipad.png
  37. BIN resources/icons/ios/app-icon-ipad@2x.png
  38. BIN resources/icons/ios/app-icon-iphone@2x.png
  39. BIN resources/icons/ios/app-icon-iphone@3x.png
  40. BIN resources/icons/ios/app-icon-setting@2x.png
  41. BIN resources/icons/ios/app-icon-setting@3x.png
  42. BIN resources/icons/ios/app-icon-spotlight.png
  43. BIN resources/icons/ios/app-icon-spotlight@2x.png
  44. BIN resources/icons/ios/app-icon-spotlight@3x.png
  45. +129 −0 resources/linux-build-helper.py
  46. +17 −0 resources/linux/DEBIAN/control
  47. +15 −0 resources/linux/DEBIAN/postinst
  48. +3 −0 resources/linux/DEBIAN/prerm
  49. +40 −0 resources/linux/rpm.spec
  50. +7 −0 resources/linux/usr/bin/Encryptr
  51. +11 −0 resources/linux/usr/share/applications/encryptr.desktop
  52. +45 −0 resources/linux/usr/share/doc/encryptr/copyright
  53. BIN resources/linux/usr/share/pixmaps/Encryptr.png
  54. +35 −0 resources/win-build-helper.py
  55. BIN splash.png
  56. +194 −14 src/app.js
  57. +2 −2 src/effects/PopFadeEffect.js
  58. +0 −1 src/models/AccountModel.js
  59. +5 −4 src/models/types/CreditCardTypeModel.js
  60. +2 −1 src/models/types/GeneralTypeModel.js
  61. +4 −3 src/models/types/PaswordTypeModel.js
  62. +11 −9 src/views/AddMenuView.js
  63. +7 −4 src/views/DialogView.js
  64. +65 −39 src/views/EditView.js
  65. +225 −31 src/views/EntriesView.js
  66. +68 −18 src/views/EntryView.js
  67. +85 −64 src/views/LoginView.js
  68. +317 −3 src/views/MainView.js
  69. +17 −3 src/views/MenuView.js
  70. +270 −0 src/views/SettingsView.js
  71. +34 −10 src/views/SignupView.js
  72. +18 −8 src/views/ToastView.js
  73. +635 −0 tests/export_csv.js
  74. +6 −0 tests/index.js
  75. +711 −0 tests/offline.js
  76. +24 −3 tpl/addMenuView.html
  77. +5 −1 tpl/editListItemView.html
  78. +1 −1 tpl/editView.html
  79. +6 −3 tpl/entriesListItemView.html
  80. +17 −4 tpl/entriesView.html
  81. +12 −6 tpl/entryView.html
  82. +3 −3 tpl/menuView.html
  83. +28 −7 tpl/navView.html
  84. +22 −0 tpl/passphraseSettingsView.html
  85. +9 −0 tpl/settingsView.html
  86. +21 −17 tpl/signupView.html
  87. +0 −21 www/config.xml
  88. BIN www/css/Jura_Light/JuraLight.eot
  89. +0 −627 www/css/Jura_Light/JuraLight.svg
  90. BIN www/css/Jura_Light/JuraLight.ttf
  91. BIN www/css/Jura_Light/JuraLight.woff
  92. +0 −92 www/css/Jura_Light/OFL.txt
  93. +0 −22 www/css/Jura_Light/demo-files/demo.css
  94. BIN www/css/Jura_Light/demo-files/fonts2u_logo.gif
  95. +0 −52 www/css/Jura_Light/demo.html
  96. +0 −22 www/css/Jura_Light/readme.txt
  97. +0 −1 www/css/Jura_Light/stylesheet.css
  98. +0 −93 www/css/Source_Sans_Pro/LICENSE.txt
  99. BIN www/css/Source_Sans_Pro/SourceSansPro-Regular.eot
  100. +0 −605 www/css/Source_Sans_Pro/SourceSansPro-Regular.svg
  101. BIN www/css/Source_Sans_Pro/SourceSansPro-Regular.ttf
  102. BIN www/css/Source_Sans_Pro/SourceSansPro-Regular.woff
  103. +0 −282 www/css/Source_Sans_Pro/SourceSansProReadMe.html
  104. +0 −22 www/css/Source_Sans_Pro/demo-files/demo.css
  105. BIN www/css/Source_Sans_Pro/demo-files/fonts2u_logo.gif
  106. +0 −52 www/css/Source_Sans_Pro/demo.html
  107. +0 −22 www/css/Source_Sans_Pro/readme.txt
  108. +0 −1 www/css/Source_Sans_Pro/stylesheet.css
  109. +698 −158 www/css/index.css
  110. +14 −0 www/img/Add.svg
  111. +14 −0 www/img/AddWhite.svg
  112. +15 −0 www/img/Back.svg
  113. +15 −0 www/img/Close.svg
  114. +15 −0 www/img/CloseGrey.svg
  115. +17 −0 www/img/CreditCard-Line.svg
  116. +24 −0 www/img/CreditCard.svg
  117. +17 −0 www/img/Delete.svg
  118. +14 −0 www/img/Edit.svg
  119. +17 −0 www/img/General-Line.svg
  120. +24 −0 www/img/General.svg
  121. +28 −0 www/img/Grid.svg
  122. +14 −0 www/img/Logo.svg
  123. +12 −0 www/img/LogoColoured.svg
  124. +16 −0 www/img/MaskPassword.svg
  125. +14 −0 www/img/More.svg
  126. +19 −0 www/img/Note.svg
  127. +16 −0 www/img/Password-Line.svg
  128. +23 −0 www/img/Password.svg
  129. +15 −0 www/img/RevealPassword.svg
  130. +14 −0 www/img/Save.svg
  131. +17 −0 www/img/Search.svg
  132. +14 −0 www/img/Settings.svg
  133. BIN www/img/Welcome.png
  134. BIN www/img/icon-encryptr.png
  135. BIN www/img/text-encryptr.png
  136. +0 −36 www/img/text-encryptr.svg
  137. +31 −32 www/index.html
  138. +11 −0 www/js/Encryptr-init.js
  139. +13 −4 www/js/backbone.crypton.js
  140. +15,725 −8,967 www/js/crypton.js
  141. +11 −7 www/js/crypton.min.js
  142. +2 −2 www/package.json
  143. +2 −1 www/tests.html
5 changes: 5 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"directory" : "components",
"json" : "bower.json",
"endpoint" : "https://bower.herokuapp.com"
}
65 changes: 0 additions & 65 deletions .cordova/hooks/after_prepare/icons_and_splash.js

This file was deleted.

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
platforms/*
plugins/*
www/css/fonts
node_modules
www/js/Encryptr.js
www/js/Encryptr.min.js
@@ -10,3 +11,6 @@ components/**/*
www/js/Encryptr-tests.js
www/js/Encryptr-templates.js
desktopbuilds/*
cache
build.json
icon.png
7 changes: 6 additions & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
@@ -15,7 +15,12 @@
"browser": true,
"wsh": true,
"sub": true,
"es5": true,
"globals": {
"cordova": true
"cordova": true,
"json2csv": true,
"URL": true,
"app": true,
"require": true
}
}
Binary file added AndroidIcon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
89 changes: 89 additions & 0 deletions CCA.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
## Encryptr Individual Contributor Assignment Agreement

Thank you for your interest in contributing to Encryptr ("We" or "Us").

This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please sign it and send it to Us by email or electronic submission, following the instructions at [https://github.com/devgeeks/Encryptr/blob/master/CONTRIBUTING.md](https://github.com/devgeeks/Encryptr/blob/master/CONTRIBUTING.md). This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us.

#### 1. Definitions

"You" means the individual who Submits a Contribution to Us.
"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in https://github.com/devgeeks/Encryptr/blob/master/CONTRIBUTING.md.
"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You.
"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material.
"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution."
"Submission Date" means the date on which You Submit a Contribution to Us.
"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier.
"Media" means any portion of a Contribution which is not software.

#### 2. Grant of Rights

##### 2.1 Copyright Assignment

(a) At the time the Contribution is Submitted, You assign to Us all right, title, and interest worldwide in all Copyright covering the Contribution; provided that this transfer is conditioned upon compliance with Section 2.3.
(b) To the extent that any of the rights in Section 2.1(a) cannot be assigned by You to Us, You grant to Us a perpetual, worldwide, exclusive, royalty-free, transferable, irrevocable license under such non-assigned rights, with rights to sublicense through multiple tiers of sublicensees, to practice such non-assigned rights, including, but not limited to, the right to reproduce, modify, display, perform and distribute the Contribution; provided that this license is conditioned upon compliance with Section 2.3.
(c) To the extent that any of the rights in Section 2.1(a) can neither be assigned nor licensed by You to Us, You irrevocably waive and agree never to assert such rights against Us, any of our successors in interest, or any of our licensees, either direct or indirect; provided that this agreement not to assert is conditioned upon compliance with Section 2.3.
(d) Upon such transfer of rights to Us, to the maximum extent possible, We immediately grant to You a perpetual, worldwide, non-exclusive, royalty-free, transferable, irrevocable license under such rights covering the Contribution, with rights to sublicense through multiple tiers of sublicensees, to reproduce, modify, display, perform, and distribute the Contribution. The intention of the parties is that this license will be as broad as possible and to provide You with rights as similar as possible to the owner of the rights that You transferred. This license back is limited to the Contribution and does not provide any rights to the Material.

##### 2.2 Patent License

For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3.

##### 2.3 Outbound License

Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date.
In addition, We may use the following licenses for Media in the Contribution: GNU Free Documentation License v1.3 (including any right to adopt any future version of a license if permitted).

##### 2.4 Moral Rights

If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect.

##### 2.5 Our Rights

You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate.

##### 2.6 Reservation of Rights

Any rights not expressly assigned or licensed under this section are expressly reserved by You.

#### 3. Agreement

You confirm that:

(a) You have the legal authority to enter into this Agreement.
(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2.
(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement.
(d) You have followed the instructions in https://github.com/devgeeks/Encryptr/blob/master/CONTRIBUTING.md, if You do not own the Copyright in the entire work of authorship Submitted.

#### 4. Disclaimer

EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US AND BY US TO YOU. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW.

#### 5. Consequential Damage Waiver

TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU OR US BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED.

#### 6. Miscellaneous

6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement.

6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings.

6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement.

6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety.

6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law.


You
________________________
Name: __________________
Address: ________________
________________________

Us
________________________
Name: __________________
Title: ___________________
Address: ________________
________________________
23 changes: 23 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
## Contributing to Encryptr

Thank you for your interest in contributing to Encryptr

#### Issues

One of the best contributions is filing issues in the [Issue Tracker](https://github.com/devgeeks/Encryptr/issues).

All contributions (feature or bugfix) should start with an issue first.

#### Pull requests

To contribute code to Encryptr, first
<a href="https://www.clahub.com/agreements/devgeeks/Encryptr">sign the Contributor License Agreement</a>.

Next:

- Fork the repository
- Create a branch (git checkout -b fix-for-that-thing)
- If possible, commit a failing test (git commit -am "adds a failing test to demonstrate that thing")
- Commit your fix/feature (git commit -am "fixes that thing")
- Push to the branch (git push origin fix-for-that-thing)
- Open a [Pull Request](https://github.com/devgeeks/Encryptr/pulls)
Loading