aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Floating Action Button added in app settingsDominik Schürmann2015-02-0337-72/+200
* | | | Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-0269-844/+1062
|\ \ \ \
| * | | | rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0168-839/+1051
| * | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-3143-1368/+1180
| |\ \ \ \
| * | | | | prevent recursive consolidateVincent Breitmoser2015-01-315-5/+11
* | | | | | UI experiments for app settingsDominik Schürmann2015-02-025-50/+69
| |/ / / / |/| | | |
* | | | | Rename app setting classes for consistencyDominik Schürmann2015-01-307-15/+14
* | | | | Fix saving of allowed keysDominik Schürmann2015-01-301-11/+5
* | | | | Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.c...Dominik Schürmann2015-01-301-1/+1
|\ \ \ \ \
| * | | | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \
| * \ \ \ \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-2711-57/+134
| |\ \ \ \ \
| | * | | | | 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
|\| | | | | |
| * | | | | | 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 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 dev...Dominik Schürmann2015-01-192-1/+9
| |\| | | |
| | * | | | 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
| * | | | | 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