Commit graph

172 commits

Author SHA1 Message Date
steckbrief
97749cd8f7 Fixed runtime errors with axolotl libraries.
Now the libraries from maven are added.
2016-02-12 19:27:51 +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
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
Daniel Gultsch
b0a314411f version code bump and tagging 1.8.1 2015-12-13 11:06:56 +01:00
Daniel Gultsch
5e79e94e77 bump version code 2015-12-11 20:37:52 +01:00
Daniel Gultsch
4cae283cff version bump to 1.8.1 and changelog 2015-12-10 23:17:11 +01:00
steckbrief
3b1723dcf1 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2015-12-10 20:37:34 +01:00
steckbrief
a745422300 Moved logcat to a module, increased error robustness for loading last messages 2015-12-10 20:01:50 +01:00
Daniel Gultsch
739a2d609d implement direct sharing in android 6.0. fixes #1321 2015-12-07 13:24:41 +01:00
Daniel Gultsch
164d341915 version bump to 1.8.0 2015-12-07 13:20:00 +01:00
steckbrief
734511b0fa Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2015-12-04 23:19:33 +01:00
steckbrief
0086d5dc80 Implements FS#83: Reload from last received message 2015-12-04 23:18:36 +01:00
Daniel Gultsch
6f8f35031f version bump to 1.8.0-beta 2015-12-02 17:25:22 +01:00
Philip Flohr
0329c9c738 users are now able to crop their avatar pictures using the android-crop
library
2015-12-02 14:25:20 +01:00
Daniel Gultsch
aeba964a65 increment version code 2015-11-26 17:44:44 +01:00
Daniel Gultsch
26ec6f7782 version bump to 1.7.3 2015-11-26 06:53:52 +01:00
fiaxh
fac1d4e0bd Use OpenPGP-API 9.0 2015-11-09 13:49:57 +00:00
Daniel Gultsch
b9de159e97 versrion bump to 1.7.2 2015-10-30 12:05:44 +01:00
Daniel Gultsch
1ec3d86eb7 version bump to 1.7.1 2015-10-29 23:16:39 +01:00
Daniel Gultsch
d4877177b7 version bump to 1.7.0 2015-10-25 22:48:02 +01:00
Daniel Gultsch
d56214f096 version bump to 1.7.0-beta.2 2015-10-21 11:14:00 +02:00
Daniel Gultsch
0bd4105b1d version bump to 1.7.0-beta 2015-10-17 16:11:13 +02:00
Daniel Gultsch
b23cb5a9e4 initial UI work to allow setting up accounts from certifcates 2015-10-09 13:37:08 +02:00
b98478e57c Merge branch 'trz/rename' into trz/rebase
Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
2015-10-05 13:55:43 +02:00
6f17b06ad0 version bump to 0.0.5 2015-10-05 12:57:33 +02:00
Daniel Gultsch
9bb8683048 increased version code 2015-10-02 11:40:51 +02:00
Daniel Gultsch
f2ccf073bd version bump and changelog 2015-09-30 23:43:32 +02:00
Daniel Gultsch
9636627ef0 version bump to 1.6.10 2015-09-20 14:31:50 +02:00
Daniel Gultsch
efc8fc5353 update build tools 2015-09-19 17:28:59 +02:00
Daniel Gultsch
15d1623ec6 increment version code 2015-09-10 11:16:53 +02:00
Daniel Gultsch
cf62fb5605 version bump to 1.6.9 + changelog 2015-09-09 23:34:42 +02:00
Daniel Gultsch
bf64276fa7 version bump to 1.6.8 and changelog 2015-09-06 19:46:26 +02:00
Daniel Gultsch
9a56e1620b version bump to 1.6.7 + changelog 2015-08-28 13:05:15 +02:00
Daniel Gultsch
593f5cdcbe version bump to 1.6.6 and changelog 2015-08-26 21:13:20 +02:00
Daniel Gultsch
4424a818df version bump to 1.6.5 + changelog 2015-08-26 00:32:42 +02:00