aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Move encrypt decrypt operations in own starter activityDominik Schürmann2015-02-032-12/+29
* More toolbar fixesDominik Schürmann2015-02-031-0/+1
* Toolbar fixes, Toolbar under status bar on LollipopDominik Schürmann2015-02-032-16/+19
* Floating Action Button added in app settingsDominik Schürmann2015-02-031-31/+68
* Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-02-0268-821/+1024
|\
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-0167-816/+1014
| * Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-01-3117-973/+985
| |\
| * | prevent recursive consolidateVincent Breitmoser2015-01-314-5/+10
* | | UI experiments for app settingsDominik Schürmann2015-02-022-11/+28
| |/ |/|
* | Rename app setting classes for consistencyDominik Schürmann2015-01-305-13/+12
* | 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-298-227/+454
* | | Introduce allowed keys table per API clientDominik Schürmann2015-01-294-5/+70
* | | Header image tryoutDominik Schürmann2015-01-291-2/+1
|/ /
* | Remove files related to old nav drawerDominik Schürmann2015-01-293-324/+1
* | Close FileDescriptors and input, output streams when possibleDominik Schürmann2015-01-291-285/+335
* | Refactor DecryptActivity into DecryptOverviewFragment for nav drawerDominik Schürmann2015-01-294-131/+132
|/
* Move key list logic into fragment, UI fixes for nav drawerDominik Schürmann2015-01-2910-302/+59
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-298-212/+362
|\
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-196-209/+196
* | 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-2710-57/+131
|\ \
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into dev...Dominik Schürmann2015-01-2710-57/+132
| |\ \
| | * | backend support for charset in ascii-armored streamsVincent Breitmoser2015-01-276-4/+65
| | * | remove unused NonPgpPartExceptionVincent Breitmoser2015-01-261-12/+0
| | * | move last parts of import logic from kis into operationVincent Breitmoser2015-01-264-41/+67
* | | | Temporary nav drawer fixesDominik Schürmann2015-01-275-18/+27
* | | | Fixes for detached signaturesDominik Schürmann2015-01-262-11/+36
* | | | Merge branch 'development' into detached-sigs-apiDominik Schürmann2015-01-26112-1853/+2324
|\| | |
| * | | Material Design DrawerDominik Schürmann2015-01-266-29/+88
| |/ /
| * | Material Design: Full screen dialogsDominik Schürmann2015-01-2612-181/+136
| * | 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-257-1/+201
| * | work on divert-to-key and other keyring stuffVincent Breitmoser2015-01-255-16/+112
| * | 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-155-567/+25
| * Yubikey numkey by default to trueDominik Schürmann2015-01-142-1/+4
| * Toolbar for settingsDominik Schürmann2015-01-144-14/+41
| * Integrate QR Code library instead of requiring the app to be installed, also ...Dominik Schürmann2015-01-141-2/+6
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-28 19:35:23 +0000