Commit Graph

141 Commits

Author SHA1 Message Date
Vincent Breitmoser
8132b9ac74 Merge branch 'master' into ditch-appmsg
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2014-07-26 23:06:32 +02:00
Dominik Schürmann
527c3e93f8 Update README.md 2014-07-19 15:16:45 +02:00
Dominik Schürmann
207870af1d Update README.md 2014-07-19 15:15:31 +02:00
Dominik Schürmann
8385c9c9dd Update README 2014-07-19 15:14:20 +02:00
Dominik Schürmann
e1d505a291 Update README with build instructions for build 2014-07-15 17:51:31 +02:00
Vincent Breitmoser
d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
Tim Bray
17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Dominik Schürmann
8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
Dominik Schürmann
70d454785f Update example code instructions 2014-06-09 22:51:13 +02:00
Dominik Schürmann
2b825c8df7 Update README for build tools 2014-06-09 22:30:12 +02:00
Dominik Schürmann
92337c2b45 Add color theme notice to README 2014-05-06 22:09:55 +02:00
Dominik Schürmann
8e645453b1 Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint 2014-05-02 17:42:40 +02:00
Dominik Schürmann
d3c59ff98e Update README 2014-04-19 15:53:34 +02:00
Dominik Schürmann
f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00
Dominik Schürmann
454b9baf11 License clarification in README 2014-04-06 17:39:56 +02:00
Dominik Schürmann
c3bb2b9d34 Update README 2014-04-06 14:50:49 +02:00
Dominik Schürmann
5c19193ca2 Update travis link 2014-04-06 14:46:43 +02:00
Dominik Schürmann
2a9ecb845d Update README 2014-04-06 13:06:12 +02:00
Dominik Schürmann
0b24ec04a6 clarify readme 2014-04-03 12:14:58 +02:00
Dominik Schürmann
0d5e99e1f0 Coding style 2014-03-26 13:42:16 +01:00
Dominik Schürmann
e5fe4245bf remove old icon entry 2014-03-26 13:39:30 +01:00
Dominik Schürmann
b75428daf7 Revert "Update README.md, icon set not used anymore"
This reverts commit 9d4582f968.
2014-03-26 13:38:45 +01:00
Thialfihar
9d4582f968 Update README.md, icon set not used anymore 2014-03-23 19:52:25 +01:00
Daniel Hammann
1df4d4a9e0 Added Windows section to CheckStyle configuration information part (and splitted Linux and MacOSX up). 2014-03-12 21:33:13 +01:00
uberspot
317595dc72 Added initial xml and readme info for checkstyle 2014-03-11 23:41:21 +02:00
Dominik Schürmann
9edd4bee70 fix pathes in README 2014-03-06 19:49:54 +01:00
Emantor
9d542ebf5b Update README 2014-03-06 19:11:11 +01:00
Daniel Hammann
bc5f2a9305 Merge branch 'master' of https://github.com/openpgp-keychain/openpgp-keychain 2014-03-05 17:05:01 +01:00
Daniel Hammann
76876a57c2 Added build-tool and api level version information 2014-03-05 14:30:56 +01:00
Dominik Schürmann
ebd6719690 Put build status on top 2014-03-03 13:36:11 +01:00
Dominik Schürmann
ab69cca2e5 README link updated 2014-03-03 13:31:21 +01:00
Dominik Schürmann
f54d183bec Put api docs into wiki 2014-03-03 13:27:43 +01:00
Dominik Schürmann
6465c1a28d Add travis status icon to README 2014-03-03 13:15:24 +01:00
Dominik Schürmann
dadca4b037 README 2014-03-03 13:11:27 +01:00
Emantor
3a16847ea3 This adds travis ci support to OpenPGP-Keychain.
Currently only correct assembly is tested since upstream
Spongycastle fails some of its tests.
2014-03-03 12:31:46 +01:00
Dominik Schürmann
a02d07b57c Merge pull request #282 from danielhass/master
Replaced Toasts with AppMsg library
2014-02-20 23:17:57 +01:00
Daniel Haß
4839172f5b Added whitespaces 2014-02-20 22:53:18 +01:00
Daniel Haß
d150e60348 Fixed the typo and whitespace issue 2014-02-20 22:29:08 +01:00
Dominik Schürmann
aba0a3d0b1 Add more information about build system 2014-02-20 22:20:43 +01:00
Daniel Haß
cff704d4a2 Updated library section (AppMsg library) 2014-02-20 21:11:29 +01:00
Dominik Schürmann
77c635ea12 rename in README 2014-02-20 20:13:36 +01:00
Dominik Schürmann
d3181f4478 update README for new API 2014-02-17 20:03:06 +01:00
Dominik Schürmann
9e4bfcbf2d update zxing links 2014-02-11 18:40:28 +01:00
Dominik Schürmann
8f8a787cc9 README 2014-02-09 20:03:53 +01:00
Dominik Schürmann
62c9d39b8c README 2014-02-09 19:24:13 +01:00
Dominik Schürmann
09ae50cc56 keyserver instead of key server 2014-02-05 13:09:59 +01:00
Dominik Schürmann
7eb34a48f4 full fingerprint in README example 2014-02-02 22:17:49 +01:00
Dominik Schürmann
ba08970850 expose key server API 2014-02-02 22:15:48 +01:00
Dominik Schürmann
91f083796c Update libs in README 2014-02-02 16:48:46 +01:00
Dominik Schürmann
5359205b50 Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry) 2014-02-01 16:17:33 +01:00