aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
|\
| * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
|\ \
| * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| |\ \
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | |/
* | / Add FAQ tab to helpDominik Schürmann2014-03-131-8/+11
|/ /
* | Readd create key menu itemsDominik Schürmann2014-03-131-12/+38
* | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
* | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
* | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-137-28/+118
|\|
| * Export cancellable - minor changesgrait2014-03-133-6/+10
| * Export is cancellable nowgrait2014-03-133-16/+52
| * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-121-0/+2
| |\
| | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1016-203/+344
| | |\
| | * | Lint changes after testingBhargav Golla2014-03-102-1/+2
| * | | change colorizing of fingerprint to use SHA1 based on apg's commit 67ffc24526uberspot2014-03-122-12/+60
* | | | 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-1213-731/+483
|\ \ \ \ | |/ / / |/| | |
| * | | add contact count to My Keys headerVincent Breitmoser2014-03-081-1/+10
| * | | better handling of multi select in ListKeysFragmentVincent Breitmoser2014-03-081-17/+22
| * | | ditch old key list activitiesVincent Breitmoser2014-03-087-1110/+1
| * | | add edit button and secret key info to public key viewVincent Breitmoser2014-03-083-1/+36
| * | | move some placeholders into resourcesVincent Breitmoser2014-03-082-3/+2
| * | | 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-086-244/+353
| * | | copy public keylist as stub for unified keylistVincent Breitmoser2014-03-063-0/+641
* | | | Merge pull request #395 from uberspot/masterDominik Schürmann2014-03-1228-185/+234
|\ \ \ \
| * | | | Add Email suggestions in Create Key activityuberspot2014-03-122-5/+53
| * | | | fix plenty of lint warnings, make some for loops into foreach, remove unused ...uberspot2014-03-1112-21/+24
| * | | | minor clean up in colorize methoduberspot2014-03-111-2/+3
| * | | | Add export... button and functionality in multi-selectuberspot2014-03-118-12/+23
| * | | | 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-116-95/+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
| |/ / /
* / / / Fix error in importing/updating keys from keyserver by removing extra 0xMiroojin Bakshi2014-03-121-1/+1
|/ / /
* | | cleanupDominik Schürmann2014-03-112-43/+37
* | | Merge pull request #392 from honnel/cursor-reset2Dominik Schürmann2014-03-111-0/+14
|\ \ \
| * | | OnFocusChangeListener replaced with OnActionExpandListenerDaniel Hammann2014-03-111-6/+10
| * | | Reset cursor query when closing search view #386Daniel Hammann2014-03-101-0/+10
| | |/ | |/|
* | | Appropriate save Icon in EditKeyActivityuberspot2014-03-112-1/+61
* | | Merge pull request #383 from sreeram-boyapati/masterDominik Schürmann2014-03-102-32/+83
|\ \ \
| * | | Added string reference for Issue #207Sreeram Boyapati2014-03-101-4/+4
| * | | ViewHolder Pattern ImplementedSreeram Boyapati2014-03-101-26/+39
| * | | Fix to passphrase dialog and Issue #207Sreeram Boyapati2014-03-101-6/+44
* | | | More fixes for KeychainIntentServiceHandlerDominik Schürmann2014-03-101-41/+43
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 10:04:42 +0000