aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/res/layout
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-0539-802/+1133
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-041-14/+13
| |\
| | * Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-14/+13
| | |
| * | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivityVincent Breitmoser2014-04-041-1/+2
| |/
| * Rename "armour" to "armor"Thialfihar2014-04-021-2/+2
| |
| * test: add junit+robolectric to buildfiles and stub test fileVincent Breitmoser2014-04-011-1/+1
| |
| * More layout fixesDominik Schürmann2014-04-011-56/+62
| |
| * More layout fixesDominik Schürmann2014-04-012-97/+108
| |
| * Language clarificationsDominik Schürmann2014-04-012-2/+3
| |
| * Fix layoutsDominik Schürmann2014-04-0110-97/+99
| |
| * Small layout fix (more to come)Dominik Schürmann2014-04-011-1/+1
| |
| * Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-014-317/+37
| |
| * Layouts for new encrypt designDominik Schürmann2014-03-316-12/+263
| |
| * Include signature result in fragmentsDominik Schürmann2014-03-303-45/+38
| |
| * Decrypt mostly works againDominik Schürmann2014-03-302-131/+12
| |
| * More experimental work on decrypt fragmentsDominik Schürmann2014-03-303-141/+207
| |
| * Experiments with fragments in decrypt activityDominik Schürmann2014-03-304-96/+182
| |
| * merge masterAshley Hughes2014-03-2948-956/+1467
| |\
| | * Show divider only when usedDominik Schürmann2014-03-261-2/+2
| | |
| | * Text for creation of new api accountsDominik Schürmann2014-03-261-0/+8
| | |
| | * Rename layouts for remote activityDominik Schürmann2014-03-264-0/+0
| | |
| | * Accounts activity prettifiedDominik Schürmann2014-03-261-8/+28
| | |
| | * Accounts list prettifiedDominik Schürmann2014-03-262-6/+15
| | |
| | * fix capability icons and remove red text for revoked keysuberspot2014-03-261-15/+18
| | |
| | * Merge pull request #482 from uberspot/masterDominik Schürmann2014-03-261-15/+22
| | |\ | | | | | | | | Fix style for expired/revoked keys
| | | * put expiry on a separate lineuberspot2014-03-261-15/+22
| | | |
| | * | Part 2 of basic user interface for api accountsDominik Schürmann2014-03-261-54/+21
| | |/
| | * Accounts API, user interfaceDominik Schürmann2014-03-262-0/+36
| | |
| | * Merge pull request #479 from AlexanderS/subkey-expiryDominik Schürmann2014-03-261-1/+9
| | |\ | | | | | | | | Display expiry of subkeys in single key view.
| | | * Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-1/+9
| | | |
| | * | Merge pull request #474 from honnel/empty-list-flashDominik Schürmann2014-03-251-2/+3
| | |\ \ | | | | | | | | | | Empty list flash
| | | * | No "empty-list" layout flashing up on start of OpenKeychainDaniel Hammann2014-03-231-2/+3
| | | | |
| | * | | More experimental work on api accountsDominik Schürmann2014-03-253-5/+19
| | | | |
| | * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-251-2/+3
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Adjust encrypt layout, align signature with buttonThialfihar2014-03-231-2/+3
| | | |/
| | * / 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-213-93/+115
| | |
| | * Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-211-0/+38
| | |\ | | | | | | | | New Fix for #410
| | | * Fix for #410Nikhil Peter Raj2014-03-211-0/+38
| | | |
| | * | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵Daniel Hammann2014-03-201-3/+4
| | | | | | | | | | | | | | | | 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
| | |
| | * Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-181-0/+7
| | |
| | * Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-181-0/+4
| | |\ | | | | | | | | Show revocation status in ViewKeyKeysAdapter #375
| | | * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-181-0/+4
| | | | | | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
| | * | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-184-8/+144
| | |\ \ | | | | | | | | | | Revamp certify dialogue
| | * | | Lock drawer as open in tabletsuberspot2014-03-1611-666/+693
| | | |/ | | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 11:17:46 +0000