aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/build.gradle
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-10/+36
|\ | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| * Workaround for Samsung Android 4.2 bugDominik Schürmann2015-05-101-0/+7
| |
| * Use snackbar lib from maven repoDominik Schürmann2015-05-101-1/+2
| |
| * Switch to new library reposDominik Schürmann2015-05-061-2/+2
| |
| * Temporary fix for gradle dependency bugDominik Schürmann2015-05-041-0/+6
| |
| * Merge branch 'development' of https://github.com/manojkhannakm/open-keychain ↵Dominik Schürmann2015-05-041-0/+12
| |\ | | | | | | | | | into manojkhannakm-development
| | * Espresso test for CreateKeyActivityManoj Khanna2015-04-251-0/+12
| | |
| * | Merge pull request #1225 from vectorijk/SwitchToMaterialDrawerDominik Schürmann2015-04-261-2/+2
| |\ \ | | | | | | | | update lib MaterialDrawer to latest(2.8.2)
| | * | update lib MaterialDrawer to latest(2.8.2)vectorijk2015-04-251-2/+2
| | | |
| * | | UI fixes for Android < 5Dominik Schürmann2015-04-261-5/+5
| |/ /
* | | linked-ids: add certificate pinning, pin twitter api certVincent Breitmoser2015-05-091-0/+1
| | |
* | | Merge remote-tracking branch 'origin/development' into linked-identitiesVincent Breitmoser2015-04-261-12/+19
|\| | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java OpenKeychain/src/main/res/menu/decrypt_menu.xml
| * | Switch to new support lib version 22.1Dominik Schürmann2015-04-251-9/+9
| |/
| * Remove old navigation drawer dependencyDominik Schürmann2015-04-251-3/+0
| |
| * Introduce and Switch to mikepenz/MaterialDrawervectorijk2015-04-241-0/+10
| |
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-241-10/+10
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| * Update libsDominik Schürmann2015-04-141-6/+6
| |
| * Update html-textview, fix buildDominik Schürmann2015-04-141-2/+2
| |
| * Switch to html-textview from JCenterDominik Schürmann2015-04-121-2/+2
| |
| * Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵Dominik Schürmann2015-03-301-4/+4
| | | | | | | | git submodules
* | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-091-42/+44
|\| | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * Update build env and pluginsDominik Schürmann2015-03-231-42/+42
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-03-231-2/+2
| |\ | | | | | | | | | development
| * | Use markdown for in-app helpDominik Schürmann2015-03-231-0/+2
| | |
* | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-241-2/+2
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | use top line in snackbar for status indicationVincent Breitmoser2015-03-221-2/+2
| |/
* / rearrange linked id layouts, add CertListWidgetVincent Breitmoser2015-03-091-0/+1
|/
* Update patternview lib, remove workaroundDominik Schürmann2015-03-031-11/+11
|
* Reorder build.gradleDominik Schürmann2015-03-021-10/+14
|
* Use gradle witnessDominik Schürmann2015-03-021-1/+35
|
* Remove supertoast dependencyDominik Schürmann2015-03-021-1/+0
|
* Use SDK and build tools versions from root projectDominik Schürmann2015-03-021-2/+2
|
* Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+1
|
* Toolbar: qr code in header, cleanup of fragmentDominik Schürmann2015-02-251-0/+1
|
* Remove old pattern lib, add new pattern libDominik Schürmann2015-02-231-2/+2
|
* Update tab lib and fix colors of tabsDominik Schürmann2015-02-231-1/+1
|
* Floating action button icons and methods for key listDominik Schürmann2015-02-211-1/+1
|
* Status bar height fixDominik Schürmann2015-02-211-1/+1
|
* Floating Action Button added in app settingsDominik Schürmann2015-02-031-0/+1
|
* Use latest buildToolsligi2015-01-291-1/+1
|
* Merge remote-tracking branch 'origin/t/snackbar' into developmentDominik Schürmann2015-01-291-0/+1
|\ | | | | | | | | Conflicts: OpenKeychain/build.gradle
| * use Notify helper everywhere, replace supertoasts with snackbar libraryVincent Breitmoser2015-01-191-0/+1
| |
* | Material Design DrawerDominik Schürmann2015-01-261-0/+1
| |
* | specify our usage of java 1.7 in build filesVincent Breitmoser2015-01-251-0/+5
|/
* Style tabs, add missing drawablesDominik Schürmann2015-01-151-0/+1
|
* Integrate QR Code library instead of requiring the app to be installed, also ↵Dominik Schürmann2015-01-141-2/+5
| | | | due to security reasons
* Increase minSdk to 15, according to statsDominik Schürmann2015-01-141-1/+1
|
* Start working on Material DesignDominik Schürmann2015-01-131-0/+1
|
* Set minSdk to 14Dominik Schürmann2015-01-131-3/+3
|
* Add android-lockpattern libraryDominik Schürmann2014-12-291-0/+1
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 18:36:58 +0000