Commit graph

100 commits

Author SHA1 Message Date
Daniel Gultsch b0710cdf04 Merge branch 'master' into development 2015-08-23 13:57:14 +02:00
Michael 10a9bd3864 update zxing to v3.2.1 2015-08-23 13:27:06 +02:00
Daniel Gultsch 96c6c793b3 version bump to 1.6.1 2015-08-23 13:25:04 +02:00
Daniel Gultsch 569bc435d3 increased version code 2015-08-16 15:00:27 +02:00
Daniel Gultsch e8e0eccd82 version bump to 1.7.0-alpha to start new development cycle 2015-08-15 19:26:52 +02:00
Daniel Gultsch 11fbc3d79e version bump to 1.6.0 2015-08-15 19:14:09 +02:00
Daniel Gultsch 81b7e27a46 version bump to 1.6.0-beta.2 2015-08-11 20:38:12 +02:00
Daniel Gultsch edd2ead7b4 version bump for ShortcutBadger 2015-08-03 14:01:58 +02:00
Daniel Gultsch 3b440b5a9b version bump to 1.6.0-beta 2015-08-01 23:38:28 +02:00
Daniel Gultsch f076b4b5c8 bump to version 1.5.2 2015-07-21 19:44:54 +02:00
Daniel Gultsch 40499be9b6 version bump to 1.5.1 and changelog 2015-07-21 12:03:28 +02:00
Daniel Gultsch 74e05023b4 very subtle 2015-07-21 02:21:34 +02:00
Andreas Straub d0c99aaedc Remove duplicate dependency 2015-07-20 15:17:11 +02:00
Andreas Straub 6f67469bda Refactor trust key ui and show in account details
Refactored the trust key row UI element so it can be used in multiple
places. It now also uses a slider to toggle the trust state, and the
redundant trust state description was removed.

EditAccountActivity now shows the keys of other devices associated with
that account.
2015-07-19 22:24:03 +02:00
Andreas Straub b8048a5538 CryptoNext persistance layer mockup
Initial sketch of the peripheral storage infrastructure for the new
axolotl-based encryption scheme.
2015-07-19 21:32:21 +02:00
Daniel Gultsch c4f3e5be3f shut up linter 2015-07-19 14:51:11 +02:00
Daniel Gultsch f58b2afcaa changed switch widget 2015-07-18 19:38:52 +02:00
Daniel Gultsch 451345f8ed bump version to 1.5.0 2015-07-18 00:16:32 +02:00
Daniel Gultsch 4f62793a67 version bump to 1.5.0-beta.2 2015-07-16 14:27:36 +02:00
Daniel Gultsch fce613e4a6 version bump to 1.5.0-beta 2015-07-10 15:15:44 +02:00
Daniel Gultsch 148955a713 version bump to 1.4.7 2015-07-04 00:05:28 +02:00
Daniel Gultsch bfe1d2489a version bump to 1.4.6 2015-07-03 13:08:25 +02:00
Daniel Gultsch 6ee11e5323 version bump to 1.4.5 2015-06-29 15:18:53 +02:00
Daniel Gultsch 2dd16a8b56 Merge branch 'development' 2015-06-23 12:15:18 +02:00
Daniel Gultsch 9b7a606cb0 version bump to 1.4.4 2015-06-23 12:14:42 +02:00
Daniel Gultsch 31deb44780 version bump 2015-06-04 16:27:27 +02:00
Daniel Gultsch a4fb6bb3a3 really update build tools 2015-06-02 15:24:58 +02:00
Daniel Gultsch ba5d0892a6 stick with 1.4.x 2015-06-02 12:23:54 +02:00
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