aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | More experimental work on API accountsDominik Schürmann2014-03-255-42/+138
| |/
| * Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-231-18/+10
| |
| * Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-214-93/+126
| |
| * remove ach language, not supported by androidDominik Schürmann2014-03-216-222/+0
| |
| * Pull from transifexDominik Schürmann2014-03-2124-0/+1311
| |
| * Pull from transifexDominik Schürmann2014-03-2121-92/+294
| |
| * Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-212-0/+40
| |\ | | | | | | New Fix for #410
| | * Fix for #410Nikhil Peter Raj2014-03-212-0/+40
| | |
| * | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵Daniel Hammann2014-03-202-3/+7
| | | | | | | | | | | | and clipboard button
| * | Fix fingerprint handlingDominik Schürmann2014-03-201-3/+4
| | |
| * | Move fingerprint up below the algorithm in key viewThialfihar2014-03-201-15/+15
| | | | | | | | | | | | | | | This makes it consistent with the key list entry layout and it also makes more sense, as it belongs to key identification.
| * | Move fingerprint to the right in key list entryThialfihar2014-03-201-8/+8
| |/ | | | | | | Fits much better there and doesn't separate the user ID.
| * Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-201-3/+4
| |
| * Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-192-0/+8
| |\
| | * Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-182-0/+8
| | |
| * | Remove oxygen text from iconDominik Schürmann2014-03-196-0/+0
| |/
| * Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-183-0/+4
| |\ | | | | | | Show revocation status in ViewKeyKeysAdapter #375
| | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-183-0/+4
| | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
| * | Merge pull request #431 from honnel/ui-modificationDominik Schürmann2014-03-183-4/+5
| |\| | | | | | | Ui modification
| | * #429 4)Daniel Hammann2014-03-173-4/+5
| | | | | | | | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server'
| * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-185-8/+146
| |\ \ | | | | | | | | Revamp certify dialogue
| | * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-171-0/+1
| | | |
| | * | certify: revamp certifykeyactivityVincent Breitmoser2014-03-152-0/+88
| | | | | | | | | | | | | | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled.
| | * | certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-151-5/+34
| | | |
| | * | certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-151-3/+12
| | | |
| | * | certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-151-0/+11
| | |/
| * | Merge pull request #420 from gogowitczak/masterDominik Schürmann2014-03-181-2/+3
| |\ \ | | | | | | | | Added FAQ: specifying connection port for Keyserver.
| | * | Added FAQ: specifying connection port for Keyserver.gogowitczak2014-03-141-2/+3
| | |/
| * | Lock drawer as open in tabletsuberspot2014-03-1618-666/+799
| | |
| * | Fix export for new unified key list #409uberspot2014-03-151-0/+1
| |/
| * Fix colors in item viewDominik Schürmann2014-03-132-2/+2
| |
| * remove unused colorDominik Schürmann2014-03-131-1/+0
| |
| * Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-134-55/+78
| |
| * Forgot faq fileDominik Schürmann2014-03-131-0/+12
| |
| * Add FAQ tab to helpDominik Schürmann2014-03-131-0/+1
| |
| * Readd create key menu itemsDominik Schürmann2014-03-132-4/+23
| |
| * XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
| |
| * Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-16/+10
| |\ | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-128-17/+11
| | |\ | | | | | | | | Lint error fix after testing
| | | * Removing tabBhargav Golla2014-03-101-1/+1
| | | |
| | | * Removing unused stringBhargav Golla2014-03-101-1/+1
| | | |
| | | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1033-278/+949
| | | |\
| | | * | Lint changes after testingBhargav Golla2014-03-108-18/+12
| | | | |
| * | | | Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1213-133/+111
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/AndroidManifest.xml OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListSecretFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListPublicAdapter.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyListSecretAdapter.java OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml OpenPGP-Keychain/src/main/res/menu/key_list.xml OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml
| | * | | add contact count to My Keys headerVincent Breitmoser2014-03-082-1/+20
| | | | |
| | * | | ditch old key list activitiesVincent Breitmoser2014-03-0811-289/+1
| | | | |
| | * | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-082-1/+35
| | | | |
| | * | | move some placeholders into resourcesVincent Breitmoser2014-03-082-2/+4
| | | | |
| | * | | working unified list (no actions yet)Vincent Breitmoser2014-03-083-2/+97
| | | | |
| | * | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-064-0/+124
| | | | |