aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle (follow)
Commit message (Collapse)AuthorAgeFilesLines
* incremented version code0.0.6lookshe2016-03-081-1/+1
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-11/+1
|\
| * Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-13/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| | * version bump to 1.11.0Daniel Gultsch2016-03-071-2/+2
| | |
| | * version bump to 1.11.0-beta.3Daniel Gultsch2016-03-051-2/+2
| | |
| | * version bump to 1.11.0-beta.2Daniel Gultsch2016-03-031-2/+2
| | |
| | * version bump to 1.11.0-beta, changelog and updated readmeDaniel Gultsch2016-03-011-2/+2
| | |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-071-0/+1
|\| |
| * | Fixes FS#150 - Swipe out conversation kills applookshe2016-03-071-0/+1
| | | | | | | | | | | | stacktrace told "java.lang.NoClassDefFoundError: com.nineoldandroids.view.ViewHelper"
* | | Version bump to 0.0.6steckbrief2016-03-061-2/+2
|/ /
* | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * version bump to 1.10.1 and changelogDaniel Gultsch2016-02-261-2/+2
| |
| * Revert "disable predexing on travis"Daniel Gultsch2016-02-231-102/+94
| | | | | | | | This reverts commit ad063d00ccbfc4a9c72c707d11b13a2da0912d28.
| * disable predexing on travisDaniel Gultsch2016-02-231-94/+102
| |
* | Explicit applicationId removedsteckbrief2016-02-231-1/+0
| |
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-12/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * version bump to 1.10.0Daniel Gultsch2016-02-211-2/+3
| |
| * version bump to 1.10.0-beta and changelogDaniel Gultsch2016-02-161-2/+2
| |
| * removed gcm plugin from gradle. fixes #1693Daniel Gultsch2016-02-121-4/+2
| |
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-20/+17
| |
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml
| * version bump to 1.9.4 + changelogDaniel Gultsch2016-02-111-2/+2
| |
* | Fixed runtime errors with axolotl libraries.steckbrief2016-02-121-0/+1
| | | | | | | | Now the libraries from maven are added.
* | axolotl resources changed from maven to jcentersteckbrief2016-02-121-2/+2
| |
* | Some runtime dependencies addedsteckbrief2016-02-111-1/+4
| |
* | Fixed third party library references in gradlesteckbrief2016-02-111-18/+11
| |
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-12/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
| * version bump to 1.9.3Daniel Gultsch2016-02-011-2/+2
| |
| * version bump to 1.9.2 + changelogDaniel Gultsch2016-01-201-2/+2
| |
| * upgraded to OpenKeychain api v10Adithya Abraham Philip2016-01-161-1/+1
| |
| * version bump to 1.9.1Daniel Gultsch2016-01-151-2/+2
| |
| * version bump to 1.9.0Daniel Gultsch2016-01-141-2/+2
| |
| * version bump to 1.9.0-beta.3Daniel Gultsch2016-01-131-2/+2
| |
| * version bump to 1.9.0-beta.2Daniel Gultsch2016-01-121-2/+2
| |
| * bump version code for betaDaniel Gultsch2016-01-091-2/+2
| |
| * version bump to 1.8.4 and changelogDaniel Gultsch2016-01-041-2/+2
| |
| * version bump and changelogDaniel Gultsch2015-12-291-2/+2
| |
| * version bump to 1.8.2Daniel Gultsch2015-12-201-2/+2
| |
| * version code bump and tagging 1.8.1Daniel Gultsch2015-12-131-1/+1
| |
| * bump version codeDaniel Gultsch2015-12-111-1/+1
| |
| * version bump to 1.8.1 and changelogDaniel Gultsch2015-12-101-2/+2
| |
| * implement direct sharing in android 6.0. fixes #1321Daniel Gultsch2015-12-071-2/+2
| |
| * version bump to 1.8.0Daniel Gultsch2015-12-071-2/+2
| |
| * version bump to 1.8.0-betaDaniel Gultsch2015-12-021-2/+2
| |
| * users are now able to crop their avatar pictures using the android-cropPhilip Flohr2015-12-021-0/+4
| | | | | | | | library
| * increment version codeDaniel Gultsch2015-11-261-1/+1
| |
| * version bump to 1.7.3Daniel Gultsch2015-11-261-2/+2
| |
| * Use OpenPGP-API 9.0fiaxh2015-11-091-1/+1
| |
| * versrion bump to 1.7.2Daniel Gultsch2015-10-301-2/+2
| |
| * version bump to 1.7.1Daniel Gultsch2015-10-291-2/+2
| |