aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Expand)AuthorAgeFilesLines
* use LoaderFragment for CertifyActivityVincent Breitmoser2014-08-313-179/+198
* Merge remote-tracking branch 'dakid/master'Vincent Breitmoser2014-08-301-1/+1
|\
| * Encrypted message is not being spellchecked anymoreDaniel Albert2014-08-301-1/+1
* | canonicalize: add check for algorithm typeVincent Breitmoser2014-08-306-12/+14
|/
* Merge pull request #796 from open-keychain/developDominik Schürmann2014-08-282-4/+42
|\
| * add ecc supportVincent Breitmoser2014-08-242-4/+40
| * Add ECDH and ECDSA valuesDominik Schürmann2014-08-211-0/+2
* | Fix RuntimeException in KeyListActivity on tabletsDominik Schürmann2014-08-286-53/+47
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-276-13/+15
|\ \
| * | small language fixes for previous commitVincent Breitmoser2014-08-276-13/+15
* | | Strip out duplicate user idsDominik Schürmann2014-08-275-5/+6
|/ /
* | Abort import of pubkeys where secret keys exist but new pubkey has more subke...Dominik Schürmann2014-08-271-0/+1
* | Cleanup FoldableLinearLayoutDominik Schürmann2014-08-274-12/+5
* | Pull from transifexDominik Schürmann2014-08-2219-13/+100
|/
* Add sync propertiesDominik Schürmann2014-08-211-1/+3
* Change account typeDominik Schürmann2014-08-212-2/+2
* XML cleanupDominik Schürmann2014-08-217-79/+11
* Pull from transifexDominik Schürmann2014-08-216-42/+22
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+3
|\
| * move key deletion into KeychainIntentHandlerVincent Breitmoser2014-08-201-0/+1
| * consolidate: small ui thingsVincent Breitmoser2014-08-201-1/+2
* | Enable sync adapter, changelogDominik Schürmann2014-08-201-0/+1
* | improve certs_textDominik Schürmann2014-08-201-1/+1
|/
* modifyKey: small logging changesVincent Breitmoser2014-08-201-2/+2
* Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-201-1/+1
|\
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-201-1/+1
| |\
| * | Fixes and temporary fixes for returning resultsDominik Schürmann2014-08-201-1/+1
* | | consolidate: prevent concurrent calls of step 2Vincent Breitmoser2014-08-201-1/+2
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2014-08-2015-76/+135
|\|
| * Pull from transifexDominik Schürmann2014-08-2015-76/+135
* | consolidate: implement (mostly) recovery modeVincent Breitmoser2014-08-201-1/+1
|/
* Pull from transifexDominik Schürmann2014-08-2032-338/+1203
* Fix stringsDominik Schürmann2014-08-191-4/+4
* consolidate: a lot more log output, better recoveryVincent Breitmoser2014-08-191-5/+23
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-08-191-0/+3
|\
| * consolidate: split into two steps, can pick up at second step if anything failsVincent Breitmoser2014-08-191-0/+3
* | Scroll fixes for certify activityDominik Schürmann2014-08-191-7/+5
|/
* certs header designDominik Schürmann2014-08-191-3/+11
* Header for certs viewDominik Schürmann2014-08-193-23/+39
* Add subkey: at least one flag should be selected!Dominik Schürmann2014-08-181-0/+1
* Fixes for expiry UIDominik Schürmann2014-08-181-0/+10
* Merge pull request #772 from mar-v-in/issue-729Vincent2014-08-171-5/+3
|\
| * Remove NoSwipeWrapContentViewPagermar-v-in2014-08-171-5/+3
* | consolidate: working implementation, lacking uiVincent Breitmoser2014-08-172-0/+21
* | modify*Key: improve handling of passphrase modification (add tests, too)Vincent Breitmoser2014-08-161-1/+5
* | typed expected failures and a couple minor thingsVincent Breitmoser2014-08-1612-17/+6
* | support for master key modifications, among other stuffVincent Breitmoser2014-08-166-6/+8
* | modifySecretKey: err out on "use previous" expiry date for (sub)key creationVincent Breitmoser2014-08-161-0/+2
* | modifySecretKey: err out on revocation of nonexistent user idVincent Breitmoser2014-08-161-0/+1
* | API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pr...Dominik Schürmann2014-08-162-7/+8
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 20:06:19 +0000