conversations

archive/conversations

Fork 0

Commit graph

f880473435 Merge pull request #1104 from BrianBlade/feature/swipe_out_conversation Daniel Gultsch 2015-04-09 10:46:26 +02:00
dace8ba3d3 Enable end-conversation by swipe gesture BrianBlade 2015-04-03 00:06:37 +02:00
c3a6d5d1d0 modified / simplified maintain scroll position code BrianBlade-feature/swipe_out_conversation iNPUTmice 2015-04-08 13:32:03 +02:00
813530145e clear notification when dismissing a conversation iNPUTmice 2015-04-08 13:07:36 +02:00
0843db71ce maintain scroll position after undo iNPUTmice 2015-04-08 13:04:50 +02:00
8ec896129d Bump version to 1.3.3 v1.3.3 Moxie Marlinspike 2015-04-06 15:41:00 -07:00
8335b0ef03 Throw NoSessionException in GroupCipher decrypt() Moxie Marlinspike 2015-04-06 12:28:16 -07:00
3d9c944288 Add decryption callback to group decrypt operations. Moxie Marlinspike 2015-04-06 12:21:54 -07:00
5c5ff5cc7a Fix discardUndo(); re-init selectedConversation BrianBlade 2015-04-06 11:37:07 +02:00
5d3b884cdb Fix undo(), rename blacklistedConversation BrianBlade 2015-04-05 14:53:42 +02:00
09aae952e8 Add blacklistedConversation for undo swipe BrianBlade 2015-04-04 16:06:50 +02:00
34a404ca31 Dont end selectedConversation on swipe BrianBlade 2015-04-04 08:57:03 +02:00
32e64c6869 Re-enable selectableItemBackground BrianBlade 2015-04-04 08:32:07 +02:00
ba58a426ac Enable end-conversation by swipe gesture BrianBlade 2015-04-03 00:06:37 +02:00
59ea143147 Merge pull request #1099 from BrianBlade/fix_otr_error_msgs Daniel Gultsch 2015-04-02 11:11:22 +02:00
ef68084098 Merge branch 'BrianBlade-account_state_switch' into development iNPUTmice 2015-04-01 23:46:54 +02:00
b7b87e1a8d do not overlap account title and switch iNPUTmice 2015-04-01 23:45:46 +02:00
cb29c5bb15 Merge branch 'account_state_switch' of https://github.com/BrianBlade/Conversations into BrianBlade-account_state_switch iNPUTmice 2015-04-01 23:24:35 +02:00
1a376cacac Merge pull request #1076 from rk4an/patch-1 Daniel Gultsch 2015-04-01 20:30:00 +02:00
64d6a2970e pulled translations from transifex iNPUTmice 2015-04-01 20:26:28 +02:00
db74cb52c4 Fix OTR-Error messages BrianBlade 2015-04-01 12:22:18 +02:00
e64049c4fc Add toggle account-state switch BrianBlade 2015-04-01 12:14:05 +02:00
e17b75511e timestamp parsing reverted steckbrief 2015-03-31 16:30:47 +02:00
6220260df3 Configurable LED color (Attention: Expert setting because currently only text input) steckbrief 2015-03-31 15:26:26 +02:00
52ed924a13 Changes for emoticon parser reactivated steckbrief 2015-03-31 14:13:12 +02:00
75c5275f7e Merge tag '1.2.0' into trz/master steckbrief 2015-03-30 22:12:49 +02:00
2a73173176 Update french translation Erkan 2015-03-22 20:09:53 +01:00
7eabdfd80f bump version code 1.2.0 iNPUTmice 2015-03-22 19:42:40 +01:00
ad8f1902d1 pulled translations iNPUTmice 2015-03-22 18:56:28 +01:00
c47d1e83c1 properly set chat states when receiving otr status messages iNPUTmice 2015-03-21 16:43:03 +01:00
99b2ef7e9d respond to unreadable OTR messages with error message. fixed #1021 iNPUTmice 2015-03-21 16:07:17 +01:00
825278971e Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2015-03-20 22:40:06 +01:00
da099e5fa4 wait for session iq to return sucessfully before sending other stanzas. fixed #1017 iNPUTmice 2015-03-20 21:48:45 +01:00
30e2dee456 Update CHANGELOG.md Daniel Gultsch 2015-03-19 19:45:47 +01:00
5793fb680f version bump to 1.2.0-beta 1.2.0-beta iNPUTmice 2015-03-19 19:40:42 +01:00
442ae12ee5 don't update presence for muc messages iNPUTmice 2015-03-19 19:40:24 +01:00
0d6475d0d9 pulled more translations iNPUTmice 2015-03-19 19:32:24 +01:00
382bcc4cb5 Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen Daniel Gultsch 2015-03-19 18:47:33 +01:00
1c600fefcf # add delivery receipts for private muc msgs # enable update last-seen for muc-msgs BrianBlade 2015-03-16 23:23:51 +01:00
a13c59fa1b Merge pull request #1043 from strb/choose_contact_multiple_squashed Daniel Gultsch 2015-03-18 17:36:23 +01:00
f76baa5658 Added multiple select to Choose Contact Activity Andreas Straub 2015-03-17 15:00:50 +01:00
7ae357f863 Merge pull request #1036 from QuentinC/development Daniel Gultsch 2015-03-18 17:11:43 +01:00
ae274ac728 Merge pull request #1041 from weiss/fix-cached-avatar-size Daniel Gultsch 2015-03-17 21:10:02 +01:00
0c98e9f80e Bump version to 1.3.2 Moxie Marlinspike 2015-03-17 10:58:15 -07:00
bf9c8708e0 Make it possible to deserialize SenderKeyDistributionMessages Moxie Marlinspike 2015-03-17 10:57:31 -07:00
52af62d298 Set file size also for cached avatars Holger Weiß 2015-03-17 17:36:17 +01:00
4aab45533a pulled new translations from transifex iNPUTmice 2015-03-16 11:52:42 +01:00
3d570f4a08 updated changelong iNPUTmice 2015-03-11 18:18:07 +01:00
74e5317095 Do not Strigprep JIDs from database Mateusz "maxmati" Nowoty?ski 2015-03-05 22:11:59 +01:00
4ee4eeb5e7 add context menu entries for geo uris iNPUTmice 2015-03-11 15:48:43 +01:00
db6a63bcf6 open location directly from notification iNPUTmice 2015-03-10 21:46:13 +01:00
5132cd7234 show geo uris as 'location' in overview iNPUTmice 2015-03-10 17:20:50 +01:00
1a5321e41f Merge pull request #1022 from Boris-de/cipher_blacklist Daniel Gultsch 2015-03-08 11:28:39 +01:00
67f8ed44bd disable all really weak cipher suites Boris Wachtmeister 2015-03-07 15:36:31 +01:00
caf7acec6e log auth elements (reveals login information in debug log. be careful!) verbose_login_log iNPUTmice 2015-03-07 14:27:16 +01:00
87a048fe6f display geo uris as location. show 'send loction' in share menu if request location intent can be resolved iNPUTmice 2015-03-07 14:15:38 +01:00
cbca92d209 fixed enter is send option iNPUTmice 2015-03-06 22:22:50 +01:00
44028a547f fixed npe in message parser iNPUTmice 2015-03-06 21:14:55 +01:00
16c6f8d2ff another teaser task for gsoc iNPUTmice 2015-03-06 14:39:05 +01:00
ce9aede11c fixed markdown syntax in todo list iNPUTmice 2015-03-06 14:27:09 +01:00
a385b6ce0b added short todo list iNPUTmice 2015-03-06 14:25:17 +01:00
f25a824610 avoid unnecessary thread creation iNPUTmice 2015-03-05 15:46:33 +01:00
c5230e081c added config option to disable string prep in jids iNPUTmice 2015-03-05 10:15:04 +01:00
aa1c41c980 Bump version to 1.3.1 v1.3.1 Moxie Marlinspike 2015-03-04 18:49:53 -08:00
7262e6970b Move in memory data structures into project. Moxie Marlinspike 2015-03-04 18:49:20 -08:00
e10c4e78f1 experimantal in memory jid caching iNPUTmice 2015-03-04 19:56:24 +01:00
fb3740f07b Green led color is better with "full-green" Quentin 2015-03-04 00:57:34 +01:00
af48198d9c Bump version to 1.3.0 v1.3.0 Moxie Marlinspike 2015-03-03 11:20:53 -08:00
327f82be41 Use more generic AxololAddress for identifying recipients. Moxie Marlinspike 2015-03-03 11:20:36 -08:00
ac577fe4fd added methods to count number of unread messages Daniel Gultsch 2015-03-02 11:53:15 +01:00
ff86fa6049 mark all sent messages up to a marker as displayed Daniel Gultsch 2015-03-01 14:15:40 +01:00
d318af098d merge messages with related status (unsend, send, send_received) iNPUTmice 2015-03-01 12:05:54 +01:00
4beb954da5 increment version code 1.1.0 iNPUTmice 2015-02-28 12:04:32 +01:00
864c709c96 catching out of memory run time exception in hasEnabledAccounts() iNPUTmice 2015-02-28 12:03:53 +01:00
0d6907f1e0 pulled new translations from transifex iNPUTmice 2015-02-27 17:20:41 +01:00
98df008bce use conversations green in notification led iNPUTmice 2015-02-27 17:16:28 +01:00
c2ddd74d7f Merge pull request #1006 from QuentinC/development Daniel Gultsch 2015-02-27 17:07:30 +01:00
f3be0d99cc don't add users with null nicks to muc user list iNPUTmice 2015-02-27 17:04:13 +01:00
6ad4865d96 hide change password menu item if server feature is unavailable iNPUTmice 2015-02-27 17:03:13 +01:00
c67a481e4b Update NotificationService.java QuentinC 2015-02-27 11:18:15 +01:00
71ce73a271 - Update mBuilder in NotificationService.java to ensure that the led is displayed at the right color. CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 - Changed led Color to green to remember the icon color and led times Quentin 2015-02-27 00:33:49 +01:00
a022e4b41a reset error status in edit account when reconnecting iNPUTmice 2015-02-26 17:17:40 +01:00
1b579f512c version bump to 1.1.0 iNPUTmice 2015-02-26 16:56:46 +01:00
9e10c3841e check for null in jid parser iNPUTmice 2015-02-26 16:56:07 +01:00
fa45ceabc9 initilize keys with jsonobject value on parse error iNPUTmice 2015-02-26 16:55:49 +01:00
b8bc70aaa0 prevent next button from showing up too early on account setup iNPUTmice 2015-02-25 23:48:45 +01:00
d53ed1bb00 Bump version to 1.2.1 v1.2.1 Moxie Marlinspike 2015-02-25 13:26:33 -08:00
0decd8ac28 version bump to 1.1.0-beta 1.1.0-beta iNPUTmice 2015-02-23 21:56:30 +01:00
3e8314459c pulled new translations from transifex iNPUTmice 2015-02-23 21:56:06 +01:00
8319446c03 reset incoming chat state when going into background iNPUTmice 2015-02-23 21:47:35 +01:00
37e9db3299 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2015-02-23 13:10:33 +01:00
7a62fbbeae get rid of some useless debugging iNPUTmice 2015-02-23 12:05:18 +01:00
b8e21e57ee Merge pull request #1000 from kriztan/patch-4 Daniel Gultsch 2015-02-23 10:48:09 +01:00
bf9bf91789 Update XEPs.md Christian S. 2015-02-23 10:36:07 +01:00
eea6a87f2d Merge pull request #997 from betheg/otr4j_repository Daniel Gultsch 2015-02-22 18:30:25 +01:00
4458750fae otr4j has moved to Maven Central Michael 2015-02-22 17:35:09 +01:00
da2da75756 init mode (first start) for StartConversationActivity (no up button) and avoid being started multiple times. fixed #995 iNPUTmice 2015-02-22 13:24:29 +01:00
7259e666ea look at 5 muc users instead of 4 for tile cache clearing iNPUTmice 2015-02-22 13:16:07 +01:00
f52bc4f0be properly remove invalid avatar iNPUTmice 2015-02-22 13:15:27 +01:00
3db5a48529 clear muc tiles cache only when necessary iNPUTmice 2015-02-21 22:19:10 +01:00