Commit graph

172 commits

Author SHA1 Message Date
Daniel Gultsch f579602456 Merge branch 'master' into development 2015-05-25 11:15:14 +02:00
Daniel Gultsch 4cb49c4a9c version bump to 1.4.3 2015-05-25 05:00:33 +02:00
Daniel Gultsch 75977818ea Merge branch 'master' into development 2015-05-21 09:19:26 +02:00
Daniel Gultsch 82d4c3b21f version bump to 1.4.2 2015-05-21 05:21:52 +02:00
Daniel Gultsch 2364710afb added ShortcutBadger as a dependency to create unread counts on launcher icon 2015-05-20 12:47:04 +02:00
Daniel Gultsch 8064832dca don't allow user to accidentally send empty messages 2015-05-20 08:25:00 +02:00
Daniel Gultsch 7824c01748 version bump to 1.4.0 2015-05-20 03:36:10 +02:00
Daniel Gultsch 7ccdc772ed version bump to 1.4.0-beta 2015-05-16 10:19:19 +02:00
Daniel Gultsch f84ccbe1fa version bump to 1.4.0-alpha3 2015-05-13 11:56:25 +02:00
Daniel Gultsch 90b74d4b80 version code bumped 2015-05-07 14:24:40 +02:00
Daniel Gultsch 9eaa6800ca bumped version code 2015-05-05 08:10:16 +02:00
Daniel Gultsch 768f1ef237 update build tools and target api 2015-05-04 05:40:41 +02:00
Daniel Gultsch 48e8e0f1fc version bump to 1.4.0-alpha (in development) 2015-05-02 12:00:27 +02:00
Daniel Gultsch 650255e18a shut up linter. fixed build 2015-05-02 11:58:19 +02:00
Daniel Gultsch 8617932aad version bump to 1.3.0 2015-05-01 13:52:56 +02:00
Daniel Gultsch 0624401137 version bump to 1.3.0-beta 2015-04-28 22:23:59 +02:00
Daniel Gultsch 031b752906 version bump to 1.3.0-beta 2015-04-26 10:49:25 +02:00
iNPUTmice 584ffbd000 bumped version to 1.3.0-alpha 2015-04-15 16:28:44 +02:00
BrianBlade dace8ba3d3 Enable end-conversation by swipe gesture
Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4
to enable swipe-out for ListViews

Re-enable selectableItemBackground

Dont end selectedConversation on swipe

Call mConversationFragment.reinit() instead.
Add separate undo string for swipe MUC.

Add blacklistedConversation for undo swipe

Update title_undo_swipe_* strings

Fix undo(), rename blacklistedConversation

Fix discardUndo(); re-init selectedConversation

maintain scroll position after undo

clear notification when dismissing a conversation

modified / simplified maintain scroll position code

simplify handling of selectedConversation

change undo_muc string, remove notifyDataSetChanged()
2015-04-08 23:29:52 +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
iNPUTmice 21069003b0 disabled proguard. fixed gradle libs 2014-11-03 19:56:38 +01:00
iNPUTmice 3e05ef77b1 version bump to 0.8.1 2014-11-03 11:20:51 +01:00
Sam Whited ef25720f0f Include build number in output of release builds 2014-10-26 10:22:37 -04:00
Sam Whited 4024136b1c Use full URI for android application Gradle plugin 2014-10-26 10:14:38 -04:00
Sam Whited a6d0042e5c Move submodules back to libs/ 2014-10-26 09:54:41 -04:00
Sam Whited 90898ec3d4 Add some logic for signing releases 2014-10-26 09:11:28 -04:00
Sam Whited c83e49d1b8 Update otr4j to 0.21 2014-10-26 09:05:12 -04:00
Sam Whited 7f484513be Pull otr4j form Maven repo 2014-10-26 08:54:41 -04:00
Sam Whited 5f4b6e39bc Use proguard on release builds
We don't need obfuscation (it's an open source project), but proguard
wil shrink the apk by stripping out unused code.
2014-10-22 18:22:49 -04:00
Sam Whited 1f49e99c46 Suppress lint errors and remove bcprov 2014-10-22 18:17:49 -04:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00
Sam Whited 07b47172a0 Add build deps and move build props to build file 2014-10-22 15:39:53 -04:00
Sam Whited 64bdd7e731 Use Gradle build system 2014-10-22 12:38:44 -04:00