mar-v-in
|
eae7c711a3
|
Merge branch 'master' into improve-file-more
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
|
2014-07-31 23:19:01 +02:00 |
|
mar-v-in
|
bc9922263c
|
Add TokenAutoComplete to gradle
|
2014-07-15 01:53:46 +02:00 |
|
Vincent Breitmoser
|
d044daeedd
|
get rid of AppMsg library
|
2014-07-07 17:33:25 +02:00 |
|
Daniel Albert
|
f3b68a9932
|
Deprecated Android Bootstrap, thus fixing #597
|
2014-06-30 19:18:20 +02:00 |
|
mar-v-in
|
2b18dc741a
|
Switch to dnsjava
|
2014-06-23 22:02:18 +02:00 |
|
Tim Bray
|
17f43ad21b
|
Moved Keybase stuff into KeybaseLib submodule
|
2014-06-20 09:31:34 -07:00 |
|
Vincent Breitmoser
|
ca4774fd62
|
Merge remote-tracking branch 'origin/master' into canonicalize
Conflicts:
.gitmodules
OpenKeychain/build.gradle
OpenKeychain/src/main/AndroidManifest.xml
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
OpenKeychain/src/main/res/values/strings.xml
settings.gradle
|
2014-06-13 00:27:40 +02:00 |
|
Vincent Breitmoser
|
97c679ada3
|
import-log: add SuperToast external library
|
2014-06-10 01:24:58 +02:00 |
|
mar-v-in
|
36312b950a
|
Add dnsjava as submodule
|
2014-06-05 23:46:14 +02:00 |
|
Dominik Schürmann
|
ab1b2df2d6
|
Move API libs and API example into their own git repos
|
2014-05-07 16:51:06 +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
|
6d11371905
|
Rename folder structure from OpenPGP Keychain to OpenKeychain
|
2014-04-06 12:57:42 +02:00 |
|
Dominik Schürmann
|
0e33fd2392
|
Split api libs into OpenKeychain specific and OpenPGP Provider lib
|
2014-03-07 23:05:03 +01:00 |
|
Dominik Schürmann
|
5c78c11756
|
remove dublication of api library, let both proejcts depend on the same
|
2014-02-27 16:40:59 +01:00 |
|
Daniel Haß
|
6d2fd89280
|
Added AppMsg library
|
2014-02-20 22:50:49 +01:00 |
|
Dominik Schürmann
|
754b2a6cb1
|
Restructuring for new API library
|
2014-02-09 19:22:14 +01:00 |
|
Dominik Schürmann
|
6eaf45940e
|
Switch from ActionBarSherlock to ActionBarCompat
|
2014-02-02 14:13:09 +01:00 |
|
Dominik Schürmann
|
6ae99cc6cb
|
New build files for spongy castle
|
2014-01-27 14:01:37 +01:00 |
|
Dominik Schürmann
|
59217ec9ba
|
fix some small layout bugs, add barcode scanner lib as source lib, fix qr code scanning issues
|
2014-01-14 21:19:43 +01:00 |
|
Dominik Schürmann
|
9da46cb2ff
|
fix gradle build
|
2014-01-10 09:09:36 +01:00 |
|
Dominik Schürmann
|
11ed8d7e16
|
add AndroidBootstrap lib
|
2014-01-09 12:31:45 +01:00 |
|
Dominik Schürmann
|
ccb462e94f
|
externalize zxing lib, fix gradle build
|
2014-01-06 22:52:45 +01:00 |
|
Dominik Schürmann
|
f5da63f988
|
New list with sticky list headers library
|
2014-01-02 21:10:08 +01:00 |
|
Dominik Schürmann
|
1d91804dc7
|
Simple new list implementations, remove library, use simple adapter with headings
|
2014-01-01 22:26:19 +01:00 |
|
Dominik Schürmann
|
516c9342d5
|
fix gradle build
|
2013-12-30 23:25:38 +01:00 |
|
Dominik Schürmann
|
1421046c6d
|
update gradle, description,...
|
2013-09-09 21:11:16 +02:00 |
|
Felix Bechstein
|
42815be83b
|
fix gradle build
|
2013-08-15 18:07:54 +05:30 |
|
Dominik Schürmann
|
23caec0471
|
move ActionBarSherlock lib, add gradle build files
|
2013-05-25 22:48:11 +02:00 |
|