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 |
|
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 |
|
