aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-26468-2984/+3918
|\| | | | | | | | | | | | | | | | | | | | | | | 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-2634-29/+94
| |/ /
| * | Material Design: Full screen dialogsDominik Schürmann2015-01-2656-272/+202
| | |
| * | specify our usage of java 1.7 in build filesVincent Breitmoser2015-01-251-0/+5
| | |
| * | 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-1521-573/+39
| |
| * 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-143-4/+12
| | | | | | | | due to security reasons
| * Increase minSdk to 15, according to statsDominik Schürmann2015-01-141-1/+1
| |
| * 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
| |/
| * Better way to have dark toolbar and light themeDominik Schürmann2015-01-142-33/+3
| |
| * Fix Toolbars in decrypt activitiesDominik Schürmann2015-01-143-14/+30
| |
| * Launcher icon fixesDominik Schürmann2015-01-1411-20/+7
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-01-1417-102/+698
| |\ | | | | | | | | | development
| | * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-148-16/+202
| | |
| | * make user_ids table typed, with attribute_data supportVincent Breitmoser2015-01-149-88/+120
| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| | * hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
| | * support addition of user attributesVincent Breitmoser2015-01-134-3/+60
| | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml
| | * add support for user attributes in merge() routineVincent Breitmoser2015-01-131-2/+28
| | |
| | * remove LinkedIdentity (committed earlier by accident)Vincent Breitmoser2015-01-131-160/+0
| | |
| | * add support for user attributes (during canonicalization)Vincent Breitmoser2015-01-125-1/+366
| | |
| * | Refactor BaseActivityDominik Schürmann2015-01-1326-62/+85
| | |
| * | Use Toolbar and new BaseActivityDominik Schürmann2015-01-1343-878/+1190
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 15:40:33 +0000