Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into db-overhaul | Vincent Breitmoser | 2014-04-04 | 1 | -14/+13 |
|\ | |||||
| * | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN | Dominik Schürmann | 2014-04-03 | 1 | -14/+13 |
| | | |||||
* | | db-overhaul: fix loading indicators in KeyListActivity and ViewKeyActivity | Vincent Breitmoser | 2014-04-04 | 1 | -1/+2 |
|/ | |||||
* | Rename "armour" to "armor" | Thialfihar | 2014-04-02 | 1 | -2/+2 |
| | |||||
* | test: add junit+robolectric to buildfiles and stub test file | Vincent Breitmoser | 2014-04-01 | 1 | -1/+1 |
| | |||||
* | More layout fixes | Dominik Schürmann | 2014-04-01 | 1 | -56/+62 |
| | |||||
* | More layout fixes | Dominik Schürmann | 2014-04-01 | 2 | -97/+108 |
| | |||||
* | Language clarifications | Dominik Schürmann | 2014-04-01 | 2 | -2/+3 |
| | |||||
* | Fix layouts | Dominik Schürmann | 2014-04-01 | 10 | -97/+99 |
| | |||||
* | Small layout fix (more to come) | Dominik Schürmann | 2014-04-01 | 1 | -1/+1 |
| | |||||
* | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 4 | -317/+37 |
| | |||||
* | Layouts for new encrypt design | Dominik Schürmann | 2014-03-31 | 6 | -12/+263 |
| | |||||
* | Include signature result in fragments | Dominik Schürmann | 2014-03-30 | 3 | -45/+38 |
| | |||||
* | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 2 | -131/+12 |
| | |||||
* | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 3 | -141/+207 |
| | |||||
* | Experiments with fragments in decrypt activity | Dominik Schürmann | 2014-03-30 | 4 | -96/+182 |
| | |||||
* | merge master | Ashley Hughes | 2014-03-29 | 48 | -956/+1467 |
|\ | |||||
| * | Show divider only when used | Dominik Schürmann | 2014-03-26 | 1 | -2/+2 |
| | | |||||
| * | Text for creation of new api accounts | Dominik Schürmann | 2014-03-26 | 1 | -0/+8 |
| | | |||||
| * | Rename layouts for remote activity | Dominik Schürmann | 2014-03-26 | 4 | -0/+0 |
| | | |||||
| * | Accounts activity prettified | Dominik Schürmann | 2014-03-26 | 1 | -8/+28 |
| | | |||||
| * | Accounts list prettified | Dominik Schürmann | 2014-03-26 | 2 | -6/+15 |
| | | |||||
| * | fix capability icons and remove red text for revoked keys | uberspot | 2014-03-26 | 1 | -15/+18 |
| | | |||||
| * | Merge pull request #482 from uberspot/master | Dominik Schürmann | 2014-03-26 | 1 | -15/+22 |
| |\ | | | | | | | Fix style for expired/revoked keys | ||||
| | * | put expiry on a separate line | uberspot | 2014-03-26 | 1 | -15/+22 |
| | | | |||||
| * | | Part 2 of basic user interface for api accounts | Dominik Schürmann | 2014-03-26 | 1 | -54/+21 |
| |/ | |||||
| * | Accounts API, user interface | Dominik Schürmann | 2014-03-26 | 2 | -0/+36 |
| | | |||||
| * | Merge pull request #479 from AlexanderS/subkey-expiry | Dominik Schürmann | 2014-03-26 | 1 | -1/+9 |
| |\ | | | | | | | Display expiry of subkeys in single key view. | ||||
| | * | Display expiry of subkeys in single key view. | Alexander Sulfrian | 2014-03-25 | 1 | -1/+9 |
| | | | |||||
| * | | Merge pull request #474 from honnel/empty-list-flash | Dominik Schürmann | 2014-03-25 | 1 | -2/+3 |
| |\ \ | | | | | | | | | Empty list flash | ||||
| | * | | No "empty-list" layout flashing up on start of OpenKeychain | Daniel Hammann | 2014-03-23 | 1 | -2/+3 |
| | | | | |||||
| * | | | More experimental work on api accounts | Dominik Schürmann | 2014-03-25 | 3 | -5/+19 |
| | | | | |||||
| * | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-03-25 | 1 | -2/+3 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Adjust encrypt layout, align signature with button | Thialfihar | 2014-03-23 | 1 | -2/+3 |
| | |/ | |||||
| * / | More experimental work on API accounts | Dominik Schürmann | 2014-03-25 | 5 | -42/+138 |
| |/ | |||||
| * | Use new FoldableLinearLayout in API settings | Dominik Schürmann | 2014-03-23 | 1 | -18/+10 |
| | | |||||
| * | Make foldable settings in EncryptActivity a separate widget | uberspot | 2014-03-21 | 3 | -93/+115 |
| | | |||||
| * | Merge pull request #458 from hav3n/branch-delete-fix | Dominik Schürmann | 2014-03-21 | 1 | -0/+38 |
| |\ | | | | | | | New Fix for #410 | ||||
| | * | Fix for #410 | Nikhil Peter Raj | 2014-03-21 | 1 | -0/+38 |
| | | | |||||
| * | | UI-Icon-Modifying #429 added hint to text edit, different icons for share ↵ | Daniel Hammann | 2014-03-20 | 1 | -3/+4 |
| | | | | | | | | | | | | and clipboard button | ||||
| * | | Fix fingerprint handling | Dominik Schürmann | 2014-03-20 | 1 | -3/+4 |
| | | | |||||
| * | | Move fingerprint up below the algorithm in key view | Thialfihar | 2014-03-20 | 1 | -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 entry | Thialfihar | 2014-03-20 | 1 | -8/+8 |
| |/ | | | | | | | Fits much better there and doesn't separate the user ID. | ||||
| * | Dont try to parse key/fingerprint result from keyserver query | Dominik Schürmann | 2014-03-20 | 1 | -3/+4 |
| | | |||||
| * | Note about blocked possibility to generate weak (<1024) RSA key. | gogowitczak | 2014-03-18 | 1 | -0/+7 |
| | | |||||
| * | Merge pull request #434 from honnel/revocation-status | Dominik Schürmann | 2014-03-18 | 1 | -0/+4 |
| |\ | | | | | | | Show revocation status in ViewKeyKeysAdapter #375 | ||||
| | * | Show revocation status in SelectPublicKeyFragment #375 | Daniel Hammann | 2014-03-18 | 1 | -0/+4 |
| | | | | | | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring) | ||||
| * | | Merge pull request #430 from Valodim/certify | Dominik Schürmann | 2014-03-18 | 4 | -8/+144 |
| |\ \ | | | | | | | | | Revamp certify dialogue | ||||
| | * | | certify: revamp certifykeyactivity | Vincent Breitmoser | 2014-03-15 | 1 | -0/+87 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 capability | Vincent Breitmoser | 2014-03-15 | 1 | -5/+34 |
| | | | |