PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Commit graph

  • 9320d2d8a2 use KeyringTestHelper.diffKeyrings method for unit test Vincent Breitmoser 2014-07-07 18:53:41 +02:00
  • 23524af81d add diffKeyrings method Vincent Breitmoser 2014-07-07 18:30:08 +02:00
  • e54dd26d29 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' Vincent Breitmoser 2014-07-07 18:19:52 +02:00
  • d8f2782293 use SuperToast instead of AppMsg in code, part 2 Vincent Breitmoser 2014-07-07 17:35:23 +02:00
  • 2c62aa90c0 use SuperToast instead of AppMsg in code, part 1 Vincent Breitmoser 2014-07-07 17:34:41 +02:00
  • d044daeedd get rid of AppMsg library Vincent Breitmoser 2014-07-07 17:32:16 +02:00
  • 4fbffd7bb4 Actually test canonicalize Art O Cathain 2014-07-06 17:46:43 +01:00
  • e906fe5387 add the GPG version Art O Cathain 2014-07-06 17:35:07 +01:00
  • c05fd07986 data fixes Art O Cathain 2014-07-06 17:09:23 +01:00
  • 9032e032ff add toString for test ease Art O Cathain 2014-07-06 15:48:47 +01:00
  • 5479eafd4b actually canonicalize Art O Cathain 2014-07-06 15:05:20 +01:00
  • cb64f8865c work in progress Art O Cathain 2014-06-29 12:18:16 +01:00
  • fed11b2647 Merge pull request #708 from artbristol/composition-not-inheritance Vincent 2014-07-06 20:39:05 +02:00
  • b02519ce25 add toString for test ease Art O Cathain 2014-07-06 15:48:47 +01:00
  • 22108cf4e2 actually canonicalize Art O Cathain 2014-07-06 15:05:20 +01:00
  • 80e09bd05e work in progress Art O Cathain 2014-06-29 12:18:16 +01:00
  • ccb1579864 Prefer composition to inheritance is the mantra these das Art O Cathain 2014-07-06 15:23:39 +01:00
  • fdf6411d5f Merge branch 'master' into improve-file-more mar-v-in 2014-07-06 02:24:34 +02:00
  • 1b0666e9de Many changes to file ... and still incomplete mar-v-in 2014-07-06 02:10:35 +02:00
  • 3363507be4 Bett API string Dominik Schürmann 2014-07-04 09:52:25 +02:00
  • 709196f774 Use strings in edit key Dominik Schürmann 2014-07-03 16:49:25 +02:00
  • e006d4762c Pull from transifex Dominik Schürmann 2014-07-03 16:38:22 +02:00
  • 9e56e53cf1 Pull from transifex Dominik Schürmann 2014-07-03 16:30:41 +02:00
  • 3085f0d229 Small strings fix Dominik Schürmann 2014-07-03 16:24:10 +02:00
  • 1ba41e7482 Remove old edit button, rename activities Dominik Schürmann 2014-07-03 16:21:16 +02:00
  • bd7b4ccf2b cleanup, debug for passphrase set Dominik Schürmann 2014-07-03 15:58:03 +02:00
  • 6ca9d8a268 fix no passphrase check Dominik Schürmann 2014-07-03 15:54:07 +02:00
  • b9d2ae938a Cache passphrase for edit Dominik Schürmann 2014-07-03 15:49:46 +02:00
  • 2988ac6e7b Cache passphrase for edit Dominik Schürmann 2014-07-03 15:48:46 +02:00
  • 85dde66804 parcel newPassphrase Dominik Schürmann 2014-07-03 15:28:45 +02:00
  • 9cbf78f7ad cleanup Dominik Schürmann 2014-07-03 15:24:04 +02:00
  • 42cc8b687b edit key: subkey adapter Dominik Schürmann 2014-07-03 15:14:06 +02:00
  • 55f067b063 Work on edit Dominik Schürmann 2014-07-03 15:05:43 +02:00
  • 8cbdf7b1c5 smaller dropdown items Dominik Schürmann 2014-07-03 08:48:33 +02:00
  • 51a4b0466b Add support for multiple input/output URIs to KeychainIntentService mar-v-in 2014-07-03 00:34:41 +02:00
  • 3512ac7199 Remove unnecessary error logs Dominik Schürmann 2014-07-02 20:53:16 +02:00
  • 12db94abca A little bit less purple Dominik Schürmann 2014-07-02 18:59:23 +02:00
  • 931bfdd9df Update spongycastle Dominik Schürmann 2014-07-02 16:56:38 +02:00
  • d967c5d864 merge KeychainIntentService Dominik Schürmann 2014-07-02 16:49:21 +02:00
  • 13a13829a8 fix nullpointer, cleanup Dominik Schürmann 2014-07-02 16:47:12 +02:00
  • 94a58f3aa8 remove init methods from adapter Dominik Schürmann 2014-07-02 16:33:30 +02:00
  • a920f9ce0c Merge remote-tracking branch 'origin/master' Vincent Breitmoser 2014-07-02 16:05:58 +02:00
  • 100b5f4c5f Merge branch 'create-keyring' Vincent Breitmoser 2014-07-02 16:05:28 +02:00
  • ebcd243e97 support changing primary user id in SaveKeyringParcel Vincent Breitmoser 2014-07-02 16:02:56 +02:00
  • 3d34eb8ca4 edit key: work on saving Dominik Schürmann 2014-07-02 15:42:38 +02:00
  • a66c6b5b7a Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-07-02 15:11:13 +02:00
  • bb39caa28d Add infographic from FSFE Dominik Schürmann 2014-07-02 15:11:06 +02:00
  • 4f83a4f163 Edit key: adding user ids Dominik Schürmann 2014-07-02 15:10:50 +02:00
  • 6f558add35 use expert create key for key creation testing (revert this later on!) Vincent Breitmoser 2014-07-02 15:05:02 +02:00
  • 9fb92c8642 fix subkey addition Vincent Breitmoser 2014-07-02 15:03:28 +02:00
  • 858be93f3d update spongycastle to include addSubkeyBindingCertification Vincent Breitmoser 2014-07-02 15:02:11 +02:00
  • 144a10a3d0 forgot a line in previous commit Vincent Breitmoser 2014-07-02 14:53:25 +02:00
  • 287b74885e don't use zero plural string for english Vincent Breitmoser 2014-07-02 14:51:11 +02:00
  • 93eae114ea Encrypt/Decrypt UI work mar-v-in 2014-07-02 00:34:21 +02:00
  • 3564773410 Add temporary file storage as discussed in #665 mar-v-in 2014-07-01 14:50:15 +02:00
  • 7408a35e19 edit key: part 3 Dominik Schürmann 2014-07-01 12:36:02 +02:00
  • 50e72b196f Missing import after merge mar-v-in 2014-07-01 01:26:50 +02:00
  • d1d414c006 Merge branch 'master' into improve-file-more mar-v-in 2014-07-01 00:15:30 +02:00
  • a901004588 remove leftover of AndroidBootstrap Dominik Schürmann 2014-06-30 22:05:02 +02:00
  • 9c1c51bf0c Removed submodule AndroidBootstrap Dominik Schürmann 2014-06-30 22:04:13 +02:00
  • 7c84b1fffd Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-30 22:01:25 +02:00
  • c2ba7e2420 work on edit key Dominik Schürmann 2014-06-30 22:01:17 +02:00
  • d07dbecef4 Merge pull request #704 from da-kid/master Dominik Schürmann 2014-06-30 21:57:33 +02:00
  • 5dcbc07af9 Fixed Bootstrap resource Daniel Albert 2014-06-30 21:32:40 +02:00
  • cc095a2098 (should have) fixed Travis builds Daniel Albert 2014-06-30 21:24:31 +02:00
  • f3b68a9932 Deprecated Android Bootstrap, thus fixing #597 Daniel Albert 2014-06-30 19:18:20 +02:00
  • 158d19a945 Fixed, issue #702 Daniel Albert 2014-06-30 19:13:09 +02:00
  • df9af316b4 Merge branch 'master' of https://github.com/open-keychain/open-keychain Daniel Albert 2014-06-30 19:09:56 +02:00
  • 1e9789f5b4 Converted all other buttons Daniel Albert 2014-06-30 19:09:13 +02:00
  • de698b8955 add create key capabilities to SaveKeyringParcel Vincent Breitmoser 2014-06-29 22:34:53 +02:00
  • 2406842847 Ported even more buttons to use new design (Key and User editor) Added drawables for them Daniel Albert 2014-06-29 22:31:37 +02:00
  • e8bb14ca26 Converted AsymetricKeyFragment to new button style Daniel Albert 2014-06-29 15:28:24 +02:00
  • 9091c22240 Added new button style and converted account_settings and the select_secret_key_layout to use it Daniel Albert 2014-06-29 13:59:51 +02:00
  • 4beff43a83 Updated file_dialog to use the new buttons Daniel Albert 2014-06-29 13:21:33 +02:00
  • e731dc139f Improved button style centered buttons removed commented-out button Daniel Albert 2014-06-29 12:33:02 +02:00
  • bd44516576 Added button_rounded style converted decrypt_file_fragment to new style Daniel Albert 2014-06-28 21:12:56 +02:00
  • 6d7a9ec48a pass import results through to viewkeyactivity on update Vincent Breitmoser 2014-06-28 20:53:37 +02:00
  • 3acb7fb087 fix nullpointerexception in importkeyactivity Vincent Breitmoser 2014-06-28 20:12:50 +02:00
  • 0067cdf221 travis: update sdk Dominik Schürmann 2014-06-28 20:49:54 +02:00
  • 97e1f365c2 Update keybase lib Dominik Schürmann 2014-06-28 20:44:01 +02:00
  • 2d95ae6466 Try new travis hack Dominik Schürmann 2014-06-28 20:36:54 +02:00
  • 17aa5d1a90 Fix supertoast submodule Dominik Schürmann 2014-06-28 20:24:02 +02:00
  • 70bf0c67e1 Update git submodules for android gradle plugin to 0.12.0 Dominik Schürmann 2014-06-28 20:17:27 +02:00
  • 2157ea59e4 Update android gradle plugin to 0.12.0 Dominik Schürmann 2014-06-28 20:15:19 +02:00
  • d6a2875816 code cleanup and plurals in import log entries Vincent Breitmoser 2014-06-28 19:00:44 +02:00
  • b7b22beafc Update subnodule keybase to fixed version of support libs Dominik Schürmann 2014-06-28 18:59:07 +02:00
  • 1738b42968 Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-28 18:56:49 +02:00
  • b34c744324 Change keybase submodule to our fork Dominik Schürmann 2014-06-28 18:56:19 +02:00
  • 6e188be81e Merge pull request #699 from da-kid/master Dominik Schürmann 2014-06-28 17:44:11 +02:00
  • 2da5bfabd3 Merge remote-tracking branch 'upstream/master' Daniel Albert 2014-06-28 12:30:30 +02:00
  • d19c97a714 Switched to the dark icons Daniel Albert 2014-06-28 12:25:41 +02:00
  • 3f3e1cdb05 Magic to find possible mails and names of device owner Dominik Schürmann 2014-06-28 00:05:12 +02:00
  • 1d5606a1a3 More wizardry Dominik Schürmann 2014-06-27 23:01:11 +02:00
  • 8bfba0826f Merge branch 'master' of github.com:open-keychain/open-keychain Dominik Schürmann 2014-06-27 21:40:26 +02:00
  • 9fe07478e7 Start work on a first-time wizard Dominik Schürmann 2014-06-27 21:40:18 +02:00
  • 567e5cc6a5 Added unlock icon, fixed drawer items, switched to icons from resource in drawer Daniel Albert 2014-06-27 21:03:19 +02:00
  • 1b90b46b00 Swapped out FontawesomeText with normal ImageView Daniel Albert 2014-06-26 21:33:42 +02:00
  • bd487bf732 Merge pull request #692 from da-kid/master Dominik Schürmann 2014-06-25 20:07:29 +02:00
  • 607af7bcca Temporary fix for #648 Daniel Albert 2014-06-25 19:20:17 +02:00
  • 150090852b Merge pull request #690 from mar-v-in/hkps-by-default Dominik Schürmann 2014-06-25 08:48:40 +02:00