aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | * merge fixes as per comments in mergeVincent Breitmoser2014-03-131-30/+19
| | | | | * remove special treatment for unified list queryVincent Breitmoser2014-03-131-39/+14
| | | | | * keychainprovider cleanup, kindasortaVincent Breitmoser2014-03-132-56/+47
| | | | | * Merge branch 'unified-keylist'Vincent Breitmoser2014-03-1227-876/+600
| | |_|_|/| | |/| | | |
| | | | | * add contact count to My Keys headerVincent Breitmoser2014-03-083-2/+30
| | | | | * better handling of multi select in ListKeysFragmentVincent Breitmoser2014-03-081-17/+22
| | | | | * ditch old key list activitiesVincent Breitmoser2014-03-0819-1433/+6
| | | | | * add edit button and secret key info to public key viewVincent Breitmoser2014-03-085-2/+71
| | | | | * move some placeholders into resourcesVincent Breitmoser2014-03-084-5/+6
| | | | | * Normalize public key uri in KeyListFragmentVincent Breitmoser2014-03-083-6/+29
| | | | | * Make EditKeyActivity's uri handling (more) saneVincent Breitmoser2014-03-082-6/+4
| | | | | * working unified list (no actions yet)Vincent Breitmoser2014-03-089-246/+450
| | | | | * copy public keylist as stub for unified keylistVincent Breitmoser2014-03-068-5/+776
* | | | | | Squashed commit of the following:Daniel Hammann2014-03-121-6/+15
| |_|/ / / |/| | | |
* | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-1244-336/+660
|\| | | |
| * | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1241-281/+609
| |\ \ \ \
| | * | | | Add Email suggestions in Create Key activityuberspot2014-03-124-6/+55
| | * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-1115-24/+24
| | * | | | Added initial xml and readme info for checkstyleuberspot2014-03-113-0/+365
| | * | | | minor clean up in colorize methoduberspot2014-03-111-2/+3
| | * | | | Add export... button and functionality in multi-selectuberspot2014-03-1110-12/+31
| | * | | | Make export work with rowIds instead of MasterKeyIdsuberspot2014-03-116-53/+92
| | * | | | Remove duplicate code from ActionBarHelper. You can now set the drawables via...uberspot2014-03-119-187/+42
| | |/ / /
| * | | | Merge pull request #397 from tharinduwijewardane/masterDominik Schürmann2014-03-121-0/+1
| |\ \ \ \
| | * | | | Issue #393 ( PublicKeyListFragment: Query not really resetted ) : FixedTharindu Wijewardane2014-03-111-0/+1
| | * | | | Merge pull request #1 from openpgp-keychain/masterTharindu Wijewardane2014-03-1160-596/+1561
| | |\| | |
| * | | | | Merge pull request #402 from mb-14/hkpgetDominik Schürmann2014-03-121-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix error in importing/updating keys from keyserver by removing extra 0xMiroojin Bakshi2014-03-121-1/+1
| |/ / / /
| * | | | more tight layoutDominik Schürmann2014-03-111-12/+10
| * | | | cleanupDominik Schürmann2014-03-112-43/+37
| * | | | Merge pull request #394 from sreeram-boyapati/masterDominik Schürmann2014-03-111-1/+4
| |\ \ \ \
| | * | | | linear layout edited to display test horizontallySreeram Boyapati2014-03-111-1/+4
| * | | | | Merge pull request #392 from honnel/cursor-reset2Dominik Schürmann2014-03-111-0/+14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychainDaniel Hammann2014-03-1148-458/+1260
|\| | | | | | |/ / / / |/| | | |
| * | | | Merge pull request #390 from uberspot/masterDominik Schürmann2014-03-109-1/+153
| |\ \ \ \
| | * | | | Appropriate save Icon in EditKeyActivityuberspot2014-03-119-1/+153
| |/ / / /
| * | | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-105-39/+109
| |\ \ \ \
| | * | | | Added string reference for Issue #207Sreeram Boyapati2014-03-102-4/+6
| | * | | | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| | * | | | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-103-13/+68
| * | | | | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
| * | | | | Pull from transifexDominik Schürmann2014-03-1023-269/+828
| * | | | | getString before init of KeychainIntentHandlerDominik Schürmann2014-03-109-62/+49
| * | | | | Fix progress_generating and reformatDominik Schürmann2014-03-101-1/+1
| * | | | | Fix progress_generating and reformatDominik Schürmann2014-03-106-61/+93
| | |_|/ / | |/| | |
* | | | | OnFocusChangeListener replaced with OnActionExpandListenerDaniel Hammann2014-03-111-6/+10
* | | | | Reset cursor query when closing search view #386Daniel Hammann2014-03-101-0/+10
|/ / / /
* | | | @color/white instead of hexDominik Schürmann2014-03-101-1/+1
* | | | Revert "Lint changes"Dominik Schürmann2014-03-1014-24/+23
* | | | Merge pull request #381 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-1014-23/+24
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 14:19:04 +0000