aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure
Commit message (Expand)AuthorAgeFilesLines
* merge masterAshley Hughes2014-03-29123-4249/+5829
|\
| * Show divider only when usedDominik Schürmann2014-03-261-0/+6
| * Rename layouts for remote activityDominik Schürmann2014-03-261-4/+4
| * Fix provider for API_ACCOUNTSDominik Schürmann2014-03-263-10/+10
| * Accounts list prettifiedDominik Schürmann2014-03-262-1/+27
| * Merge pull request #483 from uberspot/masterDominik Schürmann2014-03-261-4/+0
| |\
| | * fix capability icons and remove red text for revoked keysuberspot2014-03-261-4/+0
| * | Make PendingIntents with FLAG_CANCEL_CURRENT and FLAG_ONE_SHOTDominik Schürmann2014-03-264-51/+50
| |/
| * Forgot resourceDominik Schürmann2014-03-261-12/+0
| * Merge pull request #482 from uberspot/masterDominik Schürmann2014-03-262-10/+27
| |\
| | * add strike through text for revoked or expired keys and disable views for rev...uberspot2014-03-262-10/+27
| * | Part 2 of basic user interface for api accountsDominik Schürmann2014-03-262-55/+41
| |/
| * Accounts API, user interfaceDominik Schürmann2014-03-264-91/+194
| * Simplify can encrypt checkDominik Schürmann2014-03-261-19/+24
| * Merge pull request #471 from sreeram-boyapati/encryptionDominik Schürmann2014-03-261-1/+11
| |\
| | * Added can_encrypt checkSreeram Boyapati2014-03-231-1/+11
| * | Merge pull request #479 from AlexanderS/subkey-expiryDominik Schürmann2014-03-261-0/+22
| |\ \
| | * | Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-0/+22
| * | | Fix constraints and insertDominik Schürmann2014-03-264-19/+26
| * | | Temporary fix for inserting by content providerDominik Schürmann2014-03-251-4/+4
| * | | Return account creation intent if account does not exists in dbDominik Schürmann2014-03-255-46/+60
| * | | Fix update and insert for new api content providerDominik Schürmann2014-03-251-18/+14
| * | | More experimental work on api accountsDominik Schürmann2014-03-255-81/+97
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-2511-33/+26
| |\| |
| | * | Rename old mentionings of APG-named thingsThialfihar2014-03-2311-23/+23
| | * | Fix file decryption interfaceThialfihar2014-03-231-10/+3
| * | | More experimental work on API accountsDominik Schürmann2014-03-2516-391/+743
| * | | Extend provider for new api tablesDominik Schürmann2014-03-234-41/+222
| * | | Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-2311-15/+20
| * | | New db table for api accountsDominik Schürmann2014-03-232-6/+25
| |/ /
| * | Merge pull request #469 from honnel/save-key-workaroundDominik Schürmann2014-03-231-1/+9
| |\ \
| | * | The current implementation of saving new generated key doesn't save the key d...Daniel Hammann2014-03-221-1/+9
| * | | Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-231-41/+5
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-223-57/+210
| |\ \ \
| | * \ \ Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-222-47/+203
| | |\ \ \
| | | * | | Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-212-47/+203
| | | |/ /
| | * / / Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
| | |/ /
| * / / raname to mKeychainDatabaseDominik Schürmann2014-03-211-6/+6
| |/ /
| * | Fix nfc help buttonDominik Schürmann2014-03-211-1/+1
| * | reformat mergeDominik Schürmann2014-03-212-59/+64
| * | Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-216-140/+145
| |\ \
| | * | Fix GPL HeadersNikhil Peter Raj2014-03-213-3/+3
| | * | Fix for #410Nikhil Peter Raj2014-03-216-142/+147
| * | | URI is transported in intents data not extra.Daniel Hammann2014-03-201-2/+2
| * | | Merge pull request #457 from hav3n/branch-fix-certifyDominik Schürmann2014-03-202-72/+94
| |\ \ \
| | * | | Update fix for #451Nikhil Peter Raj2014-03-211-3/+2
| | * | | Cleanup for #451Nikhil Peter Raj2014-03-202-5/+0
| | * | | Fix for #451Nikhil Peter Raj2014-03-201-68/+96
| | |/ /
| * | | Fix fingerprint handlingDominik Schürmann2014-03-208-18/+15
| * | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-201-0/+5
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 16:37:55 +0000