aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
* | pass import results through to viewkeyactivity on updateVincent Breitmoser2014-06-281-0/+6
| |
* | code cleanup and plurals in import log entriesVincent Breitmoser2014-06-281-10/+23
| | | | | | | | closes #698
* | Merge remote-tracking branch 'upstream/master'Daniel Albert2014-06-287-0/+316
|\ \ | |/ |/|
| * Magic to find possible mails and names of device ownerDominik Schürmann2014-06-281-1/+1
| |
| * More wizardryDominik Schürmann2014-06-272-15/+43
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-271-0/+8
| |\
| * | Start work on a first-time wizardDominik Schürmann2014-06-275-0/+218
| | |
| * | new edit key: first version to add user idsDominik Schürmann2014-06-242-0/+70
| | |
* | | Switched to the dark iconsDaniel Albert2014-06-284-0/+0
| | |
* | | Added unlock icon, fixed drawer items, switched to icons from resource in drawerDaniel Albert2014-06-275-3/+5
| | |
* | | Swapped out FontawesomeText with normal ImageViewDaniel Albert2014-06-261-10/+6
| |/ |/|
* | Temporary fix for #648Daniel Albert2014-06-251-0/+8
|/
* Rename registered apps to appsDominik Schürmann2014-06-241-2/+2
|
* remove margin in import keys (leftover from nav drawer)Dominik Schürmann2014-06-231-2/+0
|
* new edit key: diff for existing user idsDominik Schürmann2014-06-222-10/+21
|
* add buttons in edit keyDominik Schürmann2014-06-221-0/+64
|
* Revert hint_keybase_searchDominik Schürmann2014-06-221-1/+1
|
* Merge pull request #668 from timbray/masterDominik Schürmann2014-06-211-1/+1
|\ | | | | Moved Keybase stuff into KeybaseLib submodule
| * Moved Keybase stuff into KeybaseLib submoduleTim Bray2014-06-201-1/+1
| |
* | Start new designed activityDominik Schürmann2014-06-213-0/+73
|/
* Use actionbar button for log activityDominik Schürmann2014-06-201-30/+0
|
* Fix onTouchEvent delegation, with workaround for Android bugDominik Schürmann2014-06-201-8/+0
|
* Remove unused code to import splitted qr codesDominik Schürmann2014-06-191-19/+0
|
* Reference ic_launcher instead of iconDominik Schürmann2014-06-184-4/+4
|
* decrease size of search icons in importDominik Schürmann2014-06-182-2/+2
|
* Fix new actionbar icon sizes, rename icon to ic_launcher following Android ↵Dominik Schürmann2014-06-1815-2/+2
| | | | naming conventions
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-3/+4
|\
| * canonicalize: missed two logging entriesVincent Breitmoser2014-06-181-3/+4
| |
* | consistent button design in import activityDominik Schürmann2014-06-182-18/+0
|/
* Merge branch 'new-edit'Vincent Breitmoser2014-06-181-1/+19
|\ | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java OpenKeychain/src/main/res/values/strings.xml
| * new-edit: add logging to modifySecretKeyRing operationVincent Breitmoser2014-06-171-0/+19
| |
* | generate public keyring from secret if not availableVincent Breitmoser2014-06-181-1/+2
| |
* | consolidate: almost sane loggingVincent Breitmoser2014-06-181-3/+4
| |
* | consolidate: add key import routines with consolidationVincent Breitmoser2014-06-181-3/+3
| |
* | consolidate: make it workVincent Breitmoser2014-06-181-6/+8
| |
* | consolidate: add loggingVincent Breitmoser2014-06-181-0/+7
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-06-181-10/+23
|\ \
| * | handle database error on secret key insertVincent Breitmoser2014-06-171-0/+1
| | |
| * | canonicalize: support secret keysVincent Breitmoser2014-06-171-1/+3
| |/
| * drop invalid user ids and add fatal case(s)Vincent Breitmoser2014-06-161-0/+2
| |
| * import-log: distinguish master/subkeys, distinguish redundant/bad certs, ↵Vincent Breitmoser2014-06-161-9/+17
| | | | | | | | more docs
* | Redesign Import, still some todos and regression bugsDominik Schürmann2014-06-1819-136/+210
|/
* Added notification area to decrypt contentDaniel Haß2014-06-161-0/+2
|
* Added notification area as reusable layoutDaniel Haß2014-06-161-0/+12
|
* Merge remote-tracking branch 'origin/master' into canonicalizeVincent Breitmoser2014-06-137-2/+28
|\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules OpenKeychain/build.gradle OpenKeychain/src/main/AndroidManifest.xml OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java OpenKeychain/src/main/res/values/strings.xml settings.gradle
| * Merge pull request #650 from open-keychain/v/import-logDominik Schürmann2014-06-061-0/+39
| |\ | | | | | | Parcelable operation result with logging capabilities + import logging
| * \ Merge pull request #649 from mar-v-in/automatic-contact-discoveryDominik Schürmann2014-06-064-0/+19
| |\ \ | | | | | | | | Automatic contact discovery and more
| | * | Fixing TAG and string resourcemar-v-in2014-06-061-2/+1
| | | |
| | * | Show keys with android contactsmar-v-in2014-06-052-3/+2
| | | | | | | | | | | | | | | | This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
| | * | Merge branch 'master' into automatic-contact-discoverymar-v-in2014-06-0493-649/+1315
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 12:06:30 +0000