aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of ↵Dominik Schürmann2015-01-301-1/+1
|\ | | | | | | https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8
| * Add explicit casting to be able to compile with java8ligi2015-01-291-1/+1
| |
* | Saving of allowed keysDominik Schürmann2015-01-2911-232/+467
| |
* | Introduce allowed keys table per API clientDominik Schürmann2015-01-294-5/+70
| |
* | Header image tryoutDominik Schürmann2015-01-294-5/+3
|/
* Remove files related to old nav drawerDominik Schürmann2015-01-2919-551/+53
|
* Fix item layout in apps listDominik Schürmann2015-01-291-10/+10
|
* Close FileDescriptors and input, output streams when possibleDominik Schürmann2015-01-291-285/+335
|
* Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-299-278/+243
|
* White popup themeDominik Schürmann2015-01-291-3/+7
|
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-2919-359/+59
|
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-2910-214/+369
|\ | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-197-210/+197
| |
* | Cloud search iconDominik Schürmann2015-01-285-2/+1
| |
* | Fix cleartext signatures internallyDominik Schürmann2015-01-271-5/+4
| |
* | Fix nullpointer in ImportKeysActivityDominik Schürmann2015-01-271-13/+24
| |
* | Support verification of detached signaturesDominik Schürmann2015-01-272-98/+223
| |
* | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-2711-57/+133
|\ \ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-2711-57/+134
| |\ \ | | | | | | | | | | | | development
| | * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-277-4/+66
| | | |
| | * | remove unused NonPgpPartExceptionVincent Breitmoser2015-01-261-12/+0
| | | |
| | * | move last parts of import logic from kis into operationVincent Breitmoser2015-01-265-41/+68
| | | |
* | | | Temporary nav drawer fixesDominik Schürmann2015-01-279-20/+54
| | | |
* | | | Fixes for detached signaturesDominik Schürmann2015-01-262-11/+36
| | | |
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-26467-2979/+3902
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | | Material Design DrawerDominik Schürmann2015-01-2633-29/+93
| |/ /
| * | Material Design: Full screen dialogsDominik Schürmann2015-01-2656-272/+202
| | |
| * | lift language level to java 7, and some code cleanupVincent Breitmoser2015-01-2588-838/+757
| | |
| * | introduce PromoteKeyOperation to create dummy secret from public keysVincent Breitmoser2015-01-258-1/+208
| | |
| * | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-256-16/+114
| | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | allow explicit re-certification in SaveKeyringParcelVincent Breitmoser2015-01-242-1/+8
| | |
| * | move key stripping into ChangeSubkey, support divert-to-cardVincent Breitmoser2015-01-245-39/+56
| | |
| * | only respect most recent signature for key flagsVincent Breitmoser2015-01-192-12/+42
| | |
| * | always show revoked user ids last!Vincent Breitmoser2015-01-191-4/+4
| | |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-192-1/+9
| |\| | | | | | | | | | development
| | * No setContentView in onCreate for KeyListActivityVincent2015-01-161-2/+0
| | |
| | * show notification if KeyListActivity is spawned with an EXTRA_RESULTVincent Breitmoser2015-01-162-1/+11
| | | | | | | | | | | | | | | | | | | | | Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| * | Disable sharing chooser blacklisting for lollipopDominik Schürmann2015-01-193-3/+6
| |/
| * Style tabs, add missing drawablesDominik Schürmann2015-01-1520-573/+38
| |
| * Fix drawable sizesDominik Schürmann2015-01-1419-0/+0
| |
| * Yubikey numkey by default to trueDominik Schürmann2015-01-142-1/+4
| |
| * Toolbar for settingsDominik Schürmann2015-01-1413-19/+56
| |
| * Integrate QR Code library instead of requiring the app to be installed, also ↵Dominik Schürmann2015-01-142-2/+7
| | | | | | | | due to security reasons
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-141-1/+1
| |\ | | | | | | | | | development
| | * fix ambiguous column name in advanced key infoVincent Breitmoser2015-01-141-1/+1
| | |
| * | Reorganize folders of graphics sourcesDominik Schürmann2015-01-1437-1/+1
| |/
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-144-5/+30
| |\ | | | | | | | | | development
| | * small fixes to user attribute handlingVincent Breitmoser2015-01-144-3/+28
| | |
| | * fix log entry for addition of user attributesVincent Breitmoser2015-01-141-3/+3
| | |
| * | Fix SearchViewDominik Schürmann2015-01-145-39/+48
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 11:48:50 +0000