|
|
fd6f0a842b
|
adjusted changelog and corrected wrong version in build.gradle due to merge
|
2016-03-27 17:17:07 +02:00 |
|
|
|
711ab9f2b1
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-25 20:13:51 +01:00 |
|
|
|
27c16b4b9a
|
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
|
2016-03-25 20:04:37 +01:00 |
|
Daniel Gultsch
|
46be514b4d
|
version bump to 1.11.2 and changelog
|
2016-03-23 19:24:54 +01:00 |
|
Daniel Gultsch
|
564113669e
|
update build deps
|
2016-03-23 12:04:23 +01:00 |
|
|
|
ad8e8344c0
|
Merge branch 'trz/rebase' (early part) into trz/rename
|
2016-03-20 02:29:46 +01:00 |
|
|
|
fb00372269
|
Merge tag '1.11.1' into trz/merge_1.11.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.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/utils/FileUtils.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-de/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-ru/strings.xml
|
2016-03-17 15:56:54 +01:00 |
|
Daniel Gultsch
|
c4b1f6171d
|
version bump to 1.11.1 and changelog
|
2016-03-16 18:12:36 +01:00 |
|
steckbrief
|
3041cc74ce
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
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/widget/Switch.java
src/main/res/layout/account_row.xml
src/main/res/layout/contact_key.xml
|
2016-03-11 23:51:10 +01:00 |
|
steckbrief
|
a444402644
|
Fixes FS#51: Change toggle in Account Management back to standard
|
2016-03-11 23:44:59 +01:00 |
|
|
|
85bb3f537a
|
incremented version code
|
2016-03-08 22:47:54 +01:00 |
|
|
|
74d6d10cb7
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-08 21:13:24 +01:00 |
|
|
|
2b86b686c5
|
Merge tag '1.11.0' into trz/merge_1.11.0
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
|
2016-03-08 10:49:47 +01:00 |
|
|
|
d620dcdc57
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-07 14:24:07 +01:00 |
|
|
|
739ae02106
|
Fixes FS#150 - Swipe out conversation kills app
stacktrace told "java.lang.NoClassDefFoundError: com.nineoldandroids.view.ViewHelper"
|
2016-03-07 14:22:48 +01:00 |
|
Daniel Gultsch
|
1e75283250
|
version bump to 1.11.0
|
2016-03-07 11:06:41 +01:00 |
|
steckbrief
|
e9536210d7
|
Version bump to 0.0.6
|
2016-03-06 21:52:49 +01:00 |
|
Daniel Gultsch
|
8339ebf3dc
|
version bump to 1.11.0-beta.3
|
2016-03-05 09:49:43 +01:00 |
|
Daniel Gultsch
|
cc67bfd8db
|
version bump to 1.11.0-beta.2
|
2016-03-03 14:07:48 +01:00 |
|
Daniel Gultsch
|
ab4d86dde7
|
version bump to 1.11.0-beta, changelog and updated readme
|
2016-03-01 11:44:51 +01:00 |
|
steckbrief
|
cd0c6ce48e
|
Merge tag '1.10.1' into trz/merge_1.10.1
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
|
2016-02-28 21:48:09 +01:00 |
|
Daniel Gultsch
|
c393e60891
|
version bump to 1.10.1 and changelog
|
2016-02-26 09:53:02 +01:00 |
|
Daniel Gultsch
|
20eebe638b
|
Revert "disable predexing on travis"
This reverts commit ad063d00cc.
|
2016-02-23 14:33:03 +01:00 |
|
Daniel Gultsch
|
ad063d00cc
|
disable predexing on travis
|
2016-02-23 14:25:13 +01:00 |
|
steckbrief
|
e429ba245e
|
Explicit applicationId removed
|
2016-02-23 13:10:51 +01:00 |
|
|
|
c5e60b43b8
|
Merge tag '1.10.0' into trz/merge_1.10.0
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
|
2016-02-22 14:36:35 +01:00 |
|
Daniel Gultsch
|
c20d8ac69e
|
version bump to 1.10.0
|
2016-02-21 23:03:30 +01:00 |
|
Daniel Gultsch
|
726393f8da
|
version bump to 1.10.0-beta and changelog
|
2016-02-16 12:59:54 +01:00 |
|
|
|
1e40764b20
|
Merge tag '1.9.4' into trz/merge_1.9.4
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
|
2016-02-16 11:41:54 +01:00 |
|
Daniel Gultsch
|
6217e33a87
|
removed gcm plugin from gradle. fixes #1693
|
2016-02-12 23:38:30 +01:00 |
|
steckbrief
|
97749cd8f7
|
Fixed runtime errors with axolotl libraries.
Now the libraries from maven are added.
|
2016-02-12 19:27:51 +01:00 |
|
Daniel Gultsch
|
32da65f910
|
client side support for XEP-0357: Push Notifications
|
2016-02-12 11:39:27 +01:00 |
|
steckbrief
|
e98d999b94
|
axolotl resources changed from maven to jcenter
|
2016-02-12 10:03:02 +01:00 |
|
steckbrief
|
d38b3c2cf2
|
Some runtime dependencies added
|
2016-02-11 22:35:22 +01:00 |
|
steckbrief
|
f7abd4237f
|
Fixed third party library references in gradle
|
2016-02-11 21:20:06 +01:00 |
|
Daniel Gultsch
|
d58d822215
|
version bump to 1.9.4 + changelog
|
2016-02-11 17:13:17 +01:00 |
|
|
|
3824eb172b
|
Merge tag '1.9.3' into trz/merge_1.9.3
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
|
2016-02-11 10:45:27 +01:00 |
|
Daniel Gultsch
|
ae83efe4a6
|
version bump to 1.9.3
|
2016-02-01 14:25:59 +01:00 |
|
Daniel Gultsch
|
62a88a4db8
|
version bump to 1.9.2 + changelog
|
2016-01-20 17:30:33 +01:00 |
|
Adithya Abraham Philip
|
f64018d0a2
|
upgraded to OpenKeychain api v10
|
2016-01-16 04:26:01 +05:30 |
|
Daniel Gultsch
|
ca7b397828
|
version bump to 1.9.1
|
2016-01-15 23:48:04 +01:00 |
|
Daniel Gultsch
|
0dede0e1de
|
version bump to 1.9.0
|
2016-01-14 20:51:09 +01:00 |
|
Daniel Gultsch
|
3b3aa5b584
|
version bump to 1.9.0-beta.3
|
2016-01-13 12:20:24 +01:00 |
|
Daniel Gultsch
|
64420f79e5
|
version bump to 1.9.0-beta.2
|
2016-01-12 16:39:04 +01:00 |
|
Daniel Gultsch
|
95db6db935
|
bump version code for beta
|
2016-01-09 16:45:10 +01:00 |
|
Daniel Gultsch
|
abdb8bfb65
|
version bump to 1.8.4 and changelog
|
2016-01-04 17:36:46 +01:00 |
|
Daniel Gultsch
|
42fb9539f8
|
version bump and changelog
|
2015-12-29 12:54:58 +01:00 |
|
Daniel Gultsch
|
1867571368
|
version bump to 1.8.2
|
2015-12-20 19:37:33 +01:00 |
|
steckbrief
|
4f0061293e
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
|
2015-12-16 21:55:02 +01:00 |
|
steckbrief
|
9d0dedc6ce
|
Build cleanup: libraries added as local resources, removed unused proguard configs, removed SwipyRefreshLayout as module and added as binary dependency, moved 3rd party binaries to separate folder
|
2015-12-14 14:56:46 +01:00 |
|
