Commit graph

232 commits

Author SHA1 Message Date
steckbrief
ecfb0dbb13 Beta version 8 2017-01-11 15:51:58 +01:00
steckbrief
28676d3048 Fixed errors with notifications 2017-01-04 23:27:10 +01:00
steckbrief
ca1cae4fac Version set to beta-6 2017-01-04 21:43:25 +01:00
steckbrief
95cb239415 Added columns to fileparams table: url, original file name, key and iv
auto download of files moved from MessageParser to MessageAdapter
download and open file representation cleaned up
2017-01-04 19:41:20 +01:00
steckbrief
b85035c2bf Adjusted maven URL 2017-01-02 15:52:00 +01:00
steckbrief
6bfda82067 versioncode and versionname updated in build.gradle 2016-11-11 16:02:33 +01:00
steckbrief
59e861ee69 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-10-20 19:45:26 +02:00
steckbrief
3ed7cb54e5 Basic filetransfer http delete implementation; Exceptions for IqPacketError added 2016-08-22 21:30:36 +02:00
steckbrief
97100834a5 Implements FS#227: Store password encrypted in internal database 2016-07-16 15:11:36 +02:00
steckbrief
be448291ca version name set to beta-3 2016-05-02 11:15:46 +02:00
steckbrief
52fec558ad Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 2016-04-18 19:27:01 +02:00
steckbrief
7df96caedb Implements FS#137: build flavors
moved Config.java parameters to a flavorable configuration file
2016-04-18 16:51:50 +02:00
ad6208e530 Merge branch 'trz/rebase' into trz/rename
Conflicts:
	build.gradle
	src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
	src/main/res/values-bg/strings.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ro-rRO/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/strings.xml
2016-04-17 17:37:43 +02:00
4b11fa4c69 Merge tag '1.11.7' into trz/merge_1.11.7
Conflicts:
	README.md
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
	src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
	src/main/java/eu/siacs/conversations/persistance/FileBackend.java
	src/main/java/eu/siacs/conversations/services/AvatarService.java
	src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.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/ConversationActivity.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/ShareWithActivity.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	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-fr/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-pt-rBR/strings.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/strings.xml
	src/main/res/xml/preferences.xml
2016-04-17 16:54:19 +02:00
Daniel Gultsch
bfe01c4322 version bump to 1.11.7 + changelog 2016-04-14 23:13:44 +02:00
Daniel Gultsch
23a0beab43 version bump to 1.11.6 + changelog 2016-04-10 21:20:13 +02:00
Daniel Gultsch
4652541b61 update gradle and gradle plugin 2016-04-09 21:47:10 +02:00
Daniel Gultsch
c22b384680 increase version code to fix nasty bug in 1.11.5 beta 2016-04-08 18:29:32 +02:00
Daniel Gultsch
7a84cfdfa2 version bump to 1.11.5 + changelog 2016-04-08 10:41:55 +02:00
aa9b5036d2 update to beta-2 and new logo for beta 2016-04-06 00:08:12 +02:00
0beb3ca30b Merge branch 'trz/rebase' into trz/rename 2016-04-05 23:35:38 +02:00
d6a076e112 Merge tag '1.11.3' into trz/rebase 2016-04-05 23:24:49 +02:00
Daniel Gultsch
b4ad2de2e5 version bump to 1.11.4 + changelog 2016-04-05 23:10:55 +02:00
Daniel Gultsch
a968260b18 fixing travis 2016-04-04 21:25:44 +02:00
62b87d0796 update build.gradle for beta 2016-04-03 15:47:32 +02:00
Daniel Gultsch
5eedce91f9 version bump to 1.11.3 and changelog 2016-04-02 18:09:07 +02:00
Christian S
1d458e8ab3 Update ShortcutBadger to version 1.1.4 2016-03-27 20:17:51 +02:00
0fab4767fd Merge branch 'trz/rename' into trz/rebase 2016-03-27 17:18:52 +02:00
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