aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
| * | 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 NoSwipeWrapContentViewPager
| * 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 ↵Dominik Schürmann2014-08-162-7/+8
|/ | | | pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables
* Merge pull request #767 from mar-v-in/issue-763Dominik Schürmann2014-08-143-9/+5
|\ | | | | Use dropdown in CertifyActivity
| * Add and use CertifyKeySpinnermar-v-in2014-08-141-8/+4
| |
| * factor KeySpinner outmar-v-in2014-08-142-1/+1
| |
* | merge: check fingerprints on merge operation! (this needs a testcase!)Vincent Breitmoser2014-08-141-1/+1
| |
* | change keybase hint following pull request #755Dominik Schürmann2014-08-1412-19/+19
| |
* | Automcomplete names and emails in keyserver tabDominik Schürmann2014-08-141-1/+1
|/
* move v3 key import prevention into canonicalization methodDominik Schürmann2014-08-141-1/+1
|
* Do not import v3 keys, they are insecure!Dominik Schürmann2014-08-141-1/+2
|
* Remove support for v3 sig generationDominik Schürmann2014-08-142-10/+3
|
* Dont write version header by defaultDominik Schürmann2014-08-147-15/+15
|
* Add user info dialogDominik Schürmann2014-08-131-0/+8
|
* Move certify action down into actions sectionDominik Schürmann2014-08-131-12/+12
|
* API: User interaction when account keys are deletedDominik Schürmann2014-08-132-2/+3
|
* passphrase instead of pass phraseDominik Schürmann2014-08-071-2/+2
|
* Pull from transifexDominik Schürmann2014-08-0775-2811/+1509
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 08:42:56 +0000