Commit Graph

85 Commits

Author SHA1 Message Date
Dominik Schürmann bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +02:00
Dominik Schürmann afc91fb918 Switch to new library repos 2015-05-06 00:08:04 +02:00
Dominik Schürmann eb9019c78c Temporary fix for gradle dependency bug 2015-05-04 14:29:47 +02:00
Dominik Schürmann 39c610c2d1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-05-04 14:18:10 +02:00
Dominik Schürmann 9eb98f6eb7 Merge pull request #1225 from vectorijk/SwitchToMaterialDrawer
update lib MaterialDrawer to latest(2.8.2)
2015-04-26 01:38:18 +02:00
Dominik Schürmann 4c74dbe11e UI fixes for Android < 5 2015-04-26 01:28:29 +02:00
vectorijk d0d4149e86 update lib MaterialDrawer to latest(2.8.2) 2015-04-25 15:33:30 -07:00
Dominik Schürmann f1f0126048 Switch to new support lib version 22.1 2015-04-25 23:40:26 +02:00
Manoj Khanna ef52a3319a Espresso test for CreateKeyActivity 2015-04-25 18:44:02 +05:30
Dominik Schürmann 933d5402a2 Remove old navigation drawer dependency 2015-04-25 14:06:53 +02:00
vectorijk 3ee2c6fc6a Introduce and Switch to mikepenz/MaterialDrawer 2015-04-24 00:00:58 -07:00
Dominik Schürmann 191784bf4b Update libs 2015-04-14 00:48:45 +02:00
Dominik Schürmann b288e5f4fe Update html-textview, fix build 2015-04-14 00:06:05 +02:00
Dominik Schürmann 2512d3007e Switch to html-textview from JCenter 2015-04-12 18:13:03 +02:00
Dominik Schürmann 2050be3995 Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of git submodules 2015-03-30 16:08:25 +02:00
Dominik Schürmann 2204195234 Update build env and plugins 2015-03-23 20:17:30 +01:00
Dominik Schürmann 633b64fd95 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-03-23 01:11:17 +01:00
Dominik Schürmann b3a599f214 Use markdown for in-app help 2015-03-23 01:11:11 +01:00
Vincent Breitmoser 8b4388e1a2 use top line in snackbar for status indication 2015-03-22 16:55:46 +01:00
Dominik Schürmann 5da57f0582 Update patternview lib, remove workaround 2015-03-03 15:56:03 +01:00
Dominik Schürmann ea24b5169e Reorder build.gradle 2015-03-02 18:50:38 +01:00
Dominik Schürmann 3c7c278ef3 Use gradle witness 2015-03-02 17:23:06 +01:00
Dominik Schürmann 84e5ac4b03 Remove supertoast dependency 2015-03-02 16:25:12 +01:00
Dominik Schürmann 505140ef2a Use SDK and build tools versions from root project 2015-03-02 16:21:51 +01:00
Dominik Schürmann f2a9a41840 Enable multi line snackbar option 2015-02-27 23:47:15 +01:00
Dominik Schürmann fa92ceeae3 Toolbar: qr code in header, cleanup of fragment 2015-02-25 13:49:21 +01:00
Dominik Schürmann 7bddd5be1d Remove old pattern lib, add new pattern lib 2015-02-23 00:28:26 +01:00
Dominik Schürmann 4e8c4af262 Update tab lib and fix colors of tabs 2015-02-23 00:11:06 +01:00
Dominik Schürmann 32acd94698 Floating action button icons and methods for key list 2015-02-21 20:46:37 +01:00
Dominik Schürmann 5b75985f95 Status bar height fix 2015-02-21 20:01:19 +01:00
Dominik Schürmann e2a8819385 Floating Action Button added in app settings 2015-02-03 14:28:54 +01:00
ligi 4aa6e37ac6 Use latest buildTools 2015-01-29 20:28:58 +01:00
Dominik Schürmann 5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development
Conflicts:
	OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
Dominik Schürmann e049895b9f Material Design Drawer 2015-01-26 15:24:42 +01:00
Vincent Breitmoser b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser 198ddfeff7 use Notify helper everywhere, replace supertoasts with snackbar library 2015-01-19 15:43:35 +01:00
Dominik Schürmann 09e992081b Style tabs, add missing drawables 2015-01-15 14:48:13 +01:00
Dominik Schürmann 85b6669625 Integrate QR Code library instead of requiring the app to be installed, also due to security reasons 2015-01-14 19:14:30 +01:00
Dominik Schürmann 9b093c6d73 Increase minSdk to 15, according to stats 2015-01-14 18:59:18 +01:00
Dominik Schürmann 2e3545949b Start working on Material Design 2015-01-13 21:55:53 +01:00
Dominik Schürmann 2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Dominik Schürmann 320f825878 Add android-lockpattern library 2014-12-29 23:10:50 +01:00
Dominik Schürmann 26341a325b Update target and support libs to SDK 21, fixing compile issues 2014-12-04 22:48:40 +01:00
Dominik Schürmann b373c866e7 Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
Dominik Schürmann 10e96dff43 Add safeslinger to build 2014-09-04 11:30:36 +02:00
Dominik Schürmann 881a50207a Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
2014-08-06 01:08:12 +02:00
Dominik Schürmann a2c1221397 Fixing lint complaints, removing unused resources 2014-08-04 16:29:16 +02:00
Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +02:00
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
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