Commit graph

63 commits

Author SHA1 Message Date
9181767ac6 version bump to 0.0.3 2015-08-16 18:47:25 +02:00
a9279c2001 adjust version code to match fdroid regex 2015-08-13 16:04:04 +02:00
639babfdb5 Merge branch 'trz/rebase' into trz/rename
Conflicts:
	build.gradle
	src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java
	src/main/java/de/thedevstack/conversationsplus/entities/Account.java
	src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
	src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java
	src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
	src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java
	src/main/java/de/thedevstack/conversationsplus/entities/Message.java
	src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
	src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java
	src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
	src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
	src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
	src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
	src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
	src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
	src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
	src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
	src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
	src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
	src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
	src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java
	src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
	src/main/java/eu/siacs/conversations/crypto/OtrService.java
	src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
	src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java
	src/main/java/eu/siacs/conversations/http/HttpConnection.java
	src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
	src/main/res/layout/activity_about.xml
2015-08-11 20:30:11 +02:00
8fd688ca96 Merge tag '1.5.2' into trz/rebase 2015-08-11 17:35:53 +02:00
steckbrief
1b5966ae3b App-Name changed to "Conversations+" in strings.xml 2015-06-19 09:47:04 +02:00
b3b4a2902e moved color picker to libs 2015-04-15 21:43:53 +02:00
cae106e310 whatsapp-like smiley implementation 2015-04-12 17:22:53 +02:00
steckbrief
e17b75511e timestamp parsing reverted 2015-03-31 16:30:47 +02:00
steckbrief
6220260df3 Configurable LED color (Attention: Expert setting because currently only text input) 2015-03-31 15:26:26 +02:00
steckbrief
52ed924a13 Changes for emoticon parser reactivated 2015-03-31 14:13:12 +02:00
iNPUTmice
7eabdfd80f bump version code 2015-03-22 19:42:40 +01:00
iNPUTmice
5793fb680f version bump to 1.2.0-beta 2015-03-19 19:40:42 +01:00
iNPUTmice
4beb954da5 increment version code 2015-02-28 12:04:32 +01:00
iNPUTmice
1b579f512c version bump to 1.1.0 2015-02-26 16:56:46 +01:00
iNPUTmice
0decd8ac28 version bump to 1.1.0-beta 2015-02-23 21:56:30 +01:00
Michael
4458750fae otr4j has moved to Maven Central 2015-02-22 17:35:09 +01:00
iNPUTmice
3f248e0d89 version bump to 1.0.5 2015-02-19 14:38:50 +01:00
iNPUTmice
24cd08e55e version bump to 1.0.4 and changelog 2015-02-16 16:57:30 +01:00
iNPUTmice
9ff39a1a1e updated bcprov to 1.51 2015-02-13 10:39:28 +01:00
iNPUTmice
a75042830f version bump to 1.0.3 2015-02-12 23:14:18 +01:00
iNPUTmice
d1076588f4 version bump to 1.0.2 2015-02-09 16:41:29 +01:00
iNPUTmice
ecbceae88b version bump 2015-02-02 14:23:35 +01:00
iNPUTmice
b5131bbd76 bumped version code again 2015-02-01 21:32:57 +01:00
iNPUTmice
3216813e49 made version codes ready for release candidate in beta channel 2015-01-29 23:56:04 +01:00
iNPUTmice
2a14a0d9b8 changed version code and version name to 1.0-beta2 2015-01-26 00:50:06 +01:00
Michael
56dec46491 update android gradle plugin to 1.0.1 2015-01-25 15:12:00 +01:00
Michael
fa7d748c3f otr4j: update to 0.22 2015-01-20 18:01:39 +01:00
iNPUTmice
e5dffcfb07 added changelog for 1.0 2015-01-19 11:32:27 +01:00
Rene Treffer
20eb770356 Switch to maven central minidns 2015-01-14 22:43:43 +01:00
Sam Whited
e95d562ac7 Don't fail on extra translations 2015-01-12 11:57:40 -05:00
Daniel Gultsch
d7fc5b6978 use latest support library 2015-01-10 23:43:18 +01:00
Sam Whited
45bb59dba8 Add materials theme 2015-01-06 21:37:49 -05:00
Daniel Gultsch
e89e54a04a version bump to 0.10 2015-01-03 19:11:27 +01:00
Michael
338fd9e7b3 gradle: fix Cannot set property outputFile on null object. 2014-12-09 19:25:59 +01:00
Daniel Gultsch
16e3c07cf1 Merge pull request #710 from betheg/as
update android gradle plugin to 0.14.4
2014-12-09 14:33:36 +01:00
Michael
0193cdb194 update gradle to 2.2.1 and android gradle plugin to 1.0.0 2014-12-09 11:12:33 +01:00
iNPUTmice
5acd471880 version bump to 0.9.3 2014-12-07 21:42:50 +01:00
Michael
c36d564b69 update android gradle plugin to 1.0.0-rc4 2014-12-05 23:26:58 +01:00
iNPUTmice
9e97529b3d version bump to 0.9.2 2014-12-03 11:18:49 +01:00
iNPUTmice
8b5294241a version bump to 0.9.1 and changelog 2014-12-01 11:19:32 +01:00
iNPUTmice
5d7597438b version bump to 0.9 2014-11-29 17:54:39 +01:00
Michael
868d9f890c update android gradle plugin to 0.14.4
to work with AS >= 0.9.0 plugin >= 0.14.0 is required
also update gradle to 2.2.
2014-11-22 19:53:37 +01:00
iNPUTmice
123036fdaa bump to version 0.9-alpha to differentiate stack traces. no feature freeze or anything else 2014-11-17 21:40:48 +01:00
iNPUTmice
d43aeb7218 Merge branch 'master' into development
Conflicts:
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
2014-11-16 12:27:17 +01:00
iNPUTmice
279534ddb4 version bump to 0.8.4 2014-11-16 12:25:08 +01:00
Sam Whited
0aa6efe444 Remove unused dependency 2014-11-09 11:03:22 -05:00
Sam Whited
b88d2ede67 Add jxmpp-stringprep-libidn dependency 2014-11-09 06:59:49 -05:00
iNPUTmice
8c325dacf4 bumped gradle files + changelog 2014-11-09 11:09:52 +01:00
iNPUTmice
413623337b version bump to 0.8.2 2014-11-06 10:32:04 +01:00
iNPUTmice
d458919c8f unfinishd qr code implemenation. thanks to @emdete 2014-11-03 22:47:07 +01:00