aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
Commit message (Collapse)AuthorAgeFilesLines
* prevent cancel dring consolidate, move logic into progressableVincent Breitmoser2014-10-264-2/+17
|
* Use new safe slinger activity from share tabDominik Schürmann2014-10-261-76/+26
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-266-16/+56
|\ | | | | | | development
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-261-10/+10
| |\ | | | | | | | | | development
| * | implement upload of keyring after certification, check that option by defaultVincent Breitmoser2014-10-266-16/+56
| | |
* | | Move advanced info into own activityDominik Schürmann2014-10-265-263/+214
| |/ |/|
* | Keyboard testsDominik Schürmann2014-10-261-10/+10
|/
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-264-7/+23
|\ | | | | | | development
| * Fail on unknown key ids on API, Key item design consistency for APIDominik Schürmann2014-10-264-3/+19
| |
| * Fix layout of select key adapterDominik Schürmann2014-10-261-4/+4
| |
* | Retry canonicalization with pubkey self certs if first attempt failedVincent Breitmoser2014-10-262-4/+17
|/ | | | Fixes #974
* Remove empty layoutDominik Schürmann2014-10-251-24/+0
|
* Remove PassphraseDialogFragmentDominik Schürmann2014-10-252-435/+2
|
* Remove old certify activityDominik Schürmann2014-10-253-461/+1
|
* Use passphrase dialog activity instead of passphrase dialogDominik Schürmann2014-10-253-36/+67
|
* Remove old exception handling code from loadersDominik Schürmann2014-10-251-35/+3
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-253-8/+20
|\ | | | | | | development
| * remove unnecessary (and buggy) BufferedInputStream wrappingVincent Breitmoser2014-10-253-8/+20
| |
* | Fix color in import listDominik Schürmann2014-10-251-6/+8
|/
* Remove tabs from import keys activityDominik Schürmann2014-10-253-320/+62
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-251-2/+2
|\ | | | | | | development
| * more rewordingVincent Breitmoser2014-10-251-2/+2
| |
* | Fixes and icons for apps list, also add Password StoreDominik Schürmann2014-10-251-12/+25
|/
* Fix result passingDominik Schürmann2014-10-252-2/+1
|
* Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-253-2/+11
|\ | | | | | | development
| * slightly change wording in merge logsVincent Breitmoser2014-10-251-0/+1
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-253-141/+234
| |\ | | | | | | | | | development
| * | change the way merging is loggedVincent Breitmoser2014-10-253-2/+10
| | |
* | | Safeslinger fixesÄDominik Schürmann2014-10-251-4/+6
| |/ |/|
* | Fix safe slinger buttonDominik Schürmann2014-10-251-1/+1
| |
* | Fix safe slinger buttonDominik Schürmann2014-10-251-2/+4
| |
* | Use selected number of users in safe slingerDominik Schürmann2014-10-251-0/+1
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-253-23/+52
|\| | | | | | | development
| * change indentation of import logsVincent Breitmoser2014-10-251-10/+10
| |
| * set padding for sublog entriesVincent Breitmoser2014-10-251-0/+2
| |
| * more work on import loggingVincent Breitmoser2014-10-251-1/+2
| |
| * add logging to import and change order of import, keyservers firstVincent Breitmoser2014-10-252-23/+49
| |
* | Safe slinger activity prepsDominik Schürmann2014-10-253-141/+231
|/
* Fix import from cloudDominik Schürmann2014-10-241-1/+1
|
* Merge pull request #973 from timbray/developmentDominik Schürmann2014-10-241-5/+6
|\ | | | | Make the Certify screen a little more self-explanatory
| * Make the Certify screen a little more self-explanatoryTim Bray2014-10-211-5/+6
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-239-128/+167
|\ \ | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
| * \ Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2014-10-2310-47/+81
| |\ \ | | | | | | | | | | | | development
| * | | integrate download from keyserver into key import operationVincent Breitmoser2014-10-239-126/+165
| | | |
* | | | Start safe slinger activityDominik Schürmann2014-10-231-0/+43
| | | |
* | | | Externalize QR Code scanning and import into its own activity for better ↵Dominik Schürmann2014-10-235-116/+232
| |/ / |/| | | | | | | | code separation
* | | Fix crash on Android 5Dominik Schürmann2014-10-221-11/+16
| |/ |/|
* | consistency for import UIDominik Schürmann2014-10-161-5/+27
| |
* | Silently fail on import on key import with ArrayIndexOutOfBoundsExceptionDominik Schürmann2014-10-162-8/+14
| |
* | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2014-10-156-8/+60
|\| | | | | | | development
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 14:35:58 +0000