Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-20 | 1 | -0/+1 |
|\ | | | | | | | development | ||||
| * | determine correct filesize during decryption from LiteralData packet | Vincent Breitmoser | 2015-02-17 | 1 | -0/+1 |
| | | |||||
* | | Screenshot for GSoC | Dominik Schürmann | 2015-02-20 | 1 | -2/+2 |
|/ | |||||
* | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 2 | -0/+9 |
| | |||||
* | Improve nav drawer drawable | Dominik Schürmann | 2015-02-03 | 1 | -0/+0 |
| | |||||
* | Fix first time wizard design | Dominik Schürmann | 2015-02-03 | 7 | -2/+17 |
| | |||||
* | Add FAB to key list | Dominik Schürmann | 2015-02-03 | 4 | -35/+104 |
| | |||||
* | Move encrypt decrypt operations in own starter activity | Dominik Schürmann | 2015-02-03 | 17 | -13/+44 |
| | |||||
* | More toolbar fixes | Dominik Schürmann | 2015-02-03 | 4 | -11/+19 |
| | |||||
* | App settings statusbar fix | Dominik Schürmann | 2015-02-03 | 2 | -3/+8 |
| | |||||
* | Toolbar fixes, Toolbar under status bar on Lollipop | Dominik Schürmann | 2015-02-03 | 32 | -80/+99 |
| | |||||
* | Floating Action Button added in app settings | Dominik Schürmann | 2015-02-03 | 36 | -41/+132 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-02-02 | 1 | -23/+38 |
|\ | | | | | | | development | ||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -23/+37 |
| | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
| * | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-01-31 | 25 | -362/+182 |
| |\ | |||||
| * | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
| | | | |||||
* | | | UI experiments for app settings | Dominik Schürmann | 2015-02-02 | 3 | -39/+41 |
| |/ |/| | |||||
* | | Rename app setting classes for consistency | Dominik Schürmann | 2015-01-30 | 2 | -2/+2 |
| | | |||||
* | | Saving of allowed keys | Dominik Schürmann | 2015-01-29 | 2 | -0/+13 |
| | | |||||
* | | Header image tryout | Dominik Schürmann | 2015-01-29 | 3 | -3/+2 |
| | | |||||
* | | Remove files related to old nav drawer | Dominik Schürmann | 2015-01-29 | 16 | -227/+52 |
| | | |||||
* | | Fix item layout in apps list | Dominik Schürmann | 2015-01-29 | 1 | -10/+10 |
| | | |||||
* | | Refactor DecryptActivity into DecryptOverviewFragment for nav drawer | Dominik Schürmann | 2015-01-29 | 4 | -119/+98 |
| | | |||||
* | | White popup theme | Dominik Schürmann | 2015-01-29 | 1 | -3/+7 |
|/ | |||||
* | Move key list logic into fragment, UI fixes for nav drawer | Dominik Schürmann | 2015-01-29 | 9 | -57/+0 |
| | |||||
* | Merge remote-tracking branch 'origin/t/snackbar' into development | Dominik Schürmann | 2015-01-29 | 1 | -1/+1 |
|\ | | | | | | | | | Conflicts: OpenKeychain/build.gradle | ||||
| * | use Notify helper everywhere, replace supertoasts with snackbar library | Vincent Breitmoser | 2015-01-19 | 1 | -1/+1 |
| | | |||||
* | | Cloud search icon | Dominik Schürmann | 2015-01-28 | 5 | -2/+1 |
| | | |||||
* | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 1 | -0/+2 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * \ | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-27 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | development | ||||
| | * | | backend support for charset in ascii-armored streams | Vincent Breitmoser | 2015-01-27 | 1 | -0/+1 |
| | | | | |||||
| | * | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 1 | -0/+1 |
| | | | | |||||
* | | | | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 4 | -2/+27 |
|/ / / | |||||
* / / | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 27 | -0/+5 |
|/ / | |||||
* | | Material Design: Full screen dialogs | Dominik Schürmann | 2015-01-26 | 44 | -91/+66 |
| | | |||||
* | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+7 |
| | | |||||
* | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -0/+2 |
|/ | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
* | Style tabs, add missing drawables | Dominik Schürmann | 2015-01-15 | 15 | -6/+13 |
| | |||||
* | Fix drawable sizes | Dominik Schürmann | 2015-01-14 | 19 | -0/+0 |
| | |||||
* | Toolbar for settings | Dominik Schürmann | 2015-01-14 | 8 | -3/+13 |
| | |||||
* | Integrate QR Code library instead of requiring the app to be installed, also ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+1 |
| | | | | due to security reasons | ||||
* | Reorganize folders of graphics sources | Dominik Schürmann | 2015-01-14 | 37 | -1/+1 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -0/+1 |
|\ | | | | | | | development | ||||
| * | small fixes to user attribute handling | Vincent Breitmoser | 2015-01-14 | 1 | -0/+1 |
| | | |||||
* | | Fix SearchView | Dominik Schürmann | 2015-01-14 | 4 | -19/+44 |
|/ | |||||
* | Better way to have dark toolbar and light theme | Dominik Schürmann | 2015-01-14 | 2 | -33/+3 |
| | |||||
* | Fix Toolbars in decrypt activities | Dominik Schürmann | 2015-01-14 | 1 | -8/+18 |
| | |||||
* | Launcher icon fixes | Dominik Schürmann | 2015-01-14 | 9 | -12/+0 |
| | |||||
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-01-14 | 1 | -1/+36 |
|\ | | | | | | | development | ||||
| * | actually import user attributes (though they are not shown anywhere yet) | Vincent Breitmoser | 2015-01-14 | 1 | -0/+17 |
| | |