Commit graph

  • 494a04ffb1 hide prepare image toasts when attaching multiple images Daniel Gultsch 2016-01-15 23:47:55 +01:00
  • d85854b686 show toast when image cropper get oom Daniel Gultsch 2016-01-15 23:47:16 +01:00
  • 943d0391d4 catch exception when reading message id from database Daniel Gultsch 2016-01-15 23:46:52 +01:00
  • 188e0a118c Merge branch 'siacs/master' into development Christian S 2016-01-15 18:19:00 +01:00
  • 35a991844a rename axolotl Christian S 2016-01-15 18:11:23 +01:00
  • c5743067ad nimbuzz.com: don't wait for disco replies to set account to online Daniel Gultsch 2016-01-15 14:26:23 +01:00
  • 635210d278 pulled translations for 1.9.0 release from transifex Daniel Gultsch 2016-01-14 21:52:17 +01:00
  • 0dede0e1de version bump to 1.9.0 Daniel Gultsch 2016-01-14 20:51:09 +01:00
  • aa6955a0d6 fixed typo when reading battery_op setting Daniel Gultsch 2016-01-14 20:38:16 +01:00
  • e0c7ed59bb Merge remote-tracking branch 'refs/remotes/origin/AvatarPatch' into development Christian S 2016-01-13 17:50:53 +01:00
  • 51a288b26d Merge pull request #63 from siacs/master Christian S 2016-01-13 17:50:25 +01:00
  • 4c2dc70828 Merge branch 'siacs/master' into development Christian S 2016-01-13 17:48:30 +01:00
  • 12fd5c46ef show /me messages in conference notifications without the name of the sender Daniel Gultsch 2016-01-13 17:35:59 +01:00
  • 3b3aa5b584 version bump to 1.9.0-beta.3 Daniel Gultsch 2016-01-13 12:20:24 +01:00
  • 14428da108 show key fetch error in activity when there are no keys to be used Daniel Gultsch 2016-01-13 12:19:56 +01:00
  • 571eb2f7f9 check for file storage permission before selecting avatar Daniel Gultsch 2016-01-13 12:05:59 +01:00
  • 5f63c397fa Merge pull request #1649 from dhiru1602/master Daniel Gultsch 2016-01-13 10:56:29 +01:00
  • ffb49c7217 use batch transactions when writing roster Dheeraj CVR 2016-01-13 11:55:46 +04:00
  • 3e9fd0185a throw security exception instead of going to next srv entry Daniel Gultsch 2016-01-12 23:42:47 +01:00
  • da298cfe59 Merge branch 'master' of github.com:siacs/Conversations Daniel Gultsch 2016-01-12 23:41:35 +01:00
  • 38c936b8ef Merge pull request #1647 from SamWhited/TorStringFix Daniel Gultsch 2016-01-12 22:58:51 +01:00
  • a6b729df43 s/TOR/Tor/g Sam Whited 2016-01-12 15:41:39 -06:00
  • d122d224bb pulled translations from transifex Daniel Gultsch 2016-01-12 16:43:38 +01:00
  • 64420f79e5 version bump to 1.9.0-beta.2 Daniel Gultsch 2016-01-12 16:39:04 +01:00
  • 893751a1d2 move some ssl socket modifiers into a seperate helper class Daniel Gultsch 2016-01-12 16:33:15 +01:00
  • 5f1e30288a Merge branch 'master' of https://github.com/moparisthebest/Conversations into moparisthebest-master Daniel Gultsch 2016-01-12 15:35:50 +01:00
  • 921d567dcb use match_parent as height in conversations overview Daniel Gultsch 2016-01-12 15:35:23 +01:00
  • da6076028f Revert "Add additional warnings to OMEMO purge key function" Daniel Gultsch 2016-01-12 09:48:49 +01:00
  • 3bea5b25cd Add additional warnings to OMEMO purge key function Andreas Straub 2016-01-12 09:32:22 +01:00
  • 217f6603c0 Implement XEP-0368: SRV records for XMPP over TLS moparisthebest 2016-01-11 17:25:16 -05:00
  • 20ec9ff2c6 reworked that loop that iterates over various servers Daniel Gultsch 2016-01-11 19:05:25 +01:00
  • a85bba0010 new art renders Daniel Gultsch 2016-01-11 18:29:02 +01:00
  • 6af02b2cc5 Merge branch 'logo_fixes' of https://github.com/fiaxh/Conversations into logo_fixes Daniel Gultsch 2016-01-11 16:03:56 +01:00
  • 000bec2c7b Cleaned up logo fiaxh 2015-11-27 00:58:06 +00:00
  • 7f1de73784 don't use the word phone in strings Daniel Gultsch 2016-01-11 15:34:26 +01:00
  • 07a5ccf4d7 Merge branch 'master' of github.com:siacs/Conversations Daniel Gultsch 2016-01-11 14:28:15 +01:00
  • 148ad7250e Update PublishProfilePictureActivity.java Christian S 2016-01-11 12:40:18 +01:00
  • 4d38ba906f pulled translations from transifex Daniel Gultsch 2016-01-11 11:19:41 +01:00
  • 616241be11 add changelog for 1.9.0 Daniel Gultsch 2016-01-11 11:17:57 +01:00
  • c296d6f446 ask to be excluded from battery optimization Daniel Gultsch 2016-01-11 11:17:45 +01:00
  • 41afd552e9 Clean up Conversations logo SVG Andreas Straub 2016-01-03 18:12:51 +01:00
  • c133b1d7e1 add missing strings Christian S 2016-01-10 15:57:14 +01:00
  • 98453056ae Merge branch 'development' of https://github.com/kriztan/Pix-Art-Messenger into development Christian S 2016-01-10 15:50:09 +01:00
  • 1515d31682 Merge branch 'siacs/master' into development Christian S 2016-01-10 15:48:38 +01:00
  • 95db6db935 bump version code for beta Daniel Gultsch 2016-01-09 16:45:10 +01:00
  • 4ab8fe13de let the user decide on whether or not to compress pictures Daniel Gultsch 2016-01-09 16:17:39 +01:00
  • 708d7c5b98 automatically adjust image compression to keep files under 512MiB Daniel Gultsch 2016-01-09 16:16:18 +01:00
  • 6acb80a83a added Config.java variable to change the default notification behaviour to always Daniel Gultsch 2016-01-08 22:07:23 +01:00
  • 9dce42ac7f don't show snackbar when notifications are disabled or paused Daniel Gultsch 2016-01-08 21:35:20 +01:00
  • a3e136b550 show per conference notification settings in details activity Daniel Gultsch 2016-01-08 21:30:46 +01:00
  • 0bb3ae37f0 show icon in conversations overview when notifications are disabled Daniel Gultsch 2016-01-08 14:41:55 +01:00
  • 5dd5685885 Merge pull request #1641 from fiaxh/uuid-fix Daniel Gultsch 2016-01-08 00:17:21 +01:00
  • c9c7383956 Merge pull request #61 from siacs/master Christian S 2016-01-06 22:01:09 +01:00
  • c59eb75a59 avoid duplicate messages when sending files to mucs. fixes #1635 Daniel Gultsch 2016-01-06 12:59:13 +01:00
  • 62d0eebe5c Correct uuid check according to RFC 4122 fiaxh 2016-01-05 20:07:29 +01:00
  • 6ec2b6e0fe added missing german strings Christian S 2016-01-05 12:39:30 +01:00
  • c3e2d2cfba added missing synchronize when pushing messages from mam backlog Daniel Gultsch 2016-01-04 20:14:29 +01:00
  • fb97f9d18f null check in getOriginalPath Daniel Gultsch 2016-01-04 20:14:08 +01:00
  • 5d0c80ee5b Merge branch 'refs/heads/siacs-master' into development Christian S 2016-01-04 19:46:59 +01:00
  • ac92023e4a copy commits Christian S 2016-01-04 19:46:41 +01:00
  • abdb8bfb65 version bump to 1.8.4 and changelog Daniel Gultsch 2016-01-04 17:36:46 +01:00
  • 501034fe0e Allow entering a JID from 'choose contact'. thanks @singpolyma fixes #1611 fixes #1602 Daniel Gultsch 2016-01-04 17:27:51 +01:00
  • fdb6b0e30d only report error after third unsuccesful attempt to connect Daniel Gultsch 2016-01-04 15:33:11 +01:00
  • f815a7cd26 properly rotate avatars Daniel Gultsch 2016-01-04 15:17:02 +01:00
  • 95bf0630f0 show trust keys activties if own keys are undecided Daniel Gultsch 2016-01-04 12:11:58 +01:00
  • c116f735dc add obb url to unencrypted messages Daniel Gultsch 2016-01-03 19:39:06 +01:00
  • a319446d41 edit account activity was still showing the omemo key with leading 0x05. fixes #1631 Daniel Gultsch 2016-01-03 19:38:48 +01:00
  • d875061407 removed xhtml body. fixes #1594 Daniel Gultsch 2016-01-01 16:52:32 +01:00
  • 73e2389eee use actual message timestamp instead of delay when updating last seen. fixes #1618 Daniel Gultsch 2015-12-31 18:06:11 +01:00
  • 58d213f291 Fix OMEMO session creating loggin Andreas Straub 2015-12-31 15:48:43 +01:00
  • 9cce7d873a Update CHANGELOG.md Christian S 2015-12-29 14:07:39 +01:00
  • 4879eb7cec Merge branch 'refs/heads/siacs-master' into development Christian S 2015-12-29 14:00:50 +01:00
  • 14baee5a02 hide settings, accounts and updater in all menus except in main window Christian S 2015-12-29 12:39:01 +01:00
  • fa1817dd63 copy commits Christian S 2015-12-29 13:59:29 +01:00
  • ad08474e77 translated readme into German Christian S 2015-12-29 13:52:37 +01:00
  • 42fb9539f8 version bump and changelog Daniel Gultsch 2015-12-29 12:54:58 +01:00
  • 9c677377aa hide settings, accounts and updater in all menus except in main window Christian S 2015-12-29 12:39:01 +01:00
  • cfccf5e90d handle null names in getColorForName Daniel Gultsch 2015-12-29 10:32:54 +01:00
  • 60d48cbc86 version 1.8.3 + changes Christian S 2015-12-28 08:31:53 +01:00
  • e4f51e2254 deduplicate strings Christian S 2015-12-28 08:30:30 +01:00
  • eec4b5a3e5 Merge branch 'refs/heads/siacs-master' into development Christian S 2015-12-28 08:21:32 +01:00
  • f7afd7b265 copy commits Christian S 2015-12-28 08:21:23 +01:00
  • 7bb67ee660 strip leading 0x05 off omemo fingerprints Daniel Gultsch 2015-12-27 18:37:31 +01:00
  • 703d95fcf8 lower case all fingerprints. fixes #1521 Daniel Gultsch 2015-12-27 18:37:12 +01:00
  • c3bdec1ce9 dedublicate bookmarks Daniel Gultsch 2015-12-27 17:29:32 +01:00
  • bcf99db3df fixed stuck at omemo encryption when x509 verification is being used Daniel Gultsch 2015-12-27 17:29:19 +01:00
  • f49158a44b register context menu long click listener on message text. fixes #1614 Daniel Gultsch 2015-12-27 17:28:42 +01:00
  • be91c0741f made text selectable again unless text contains more than 1 link fixes #1615 Daniel Gultsch 2015-12-26 19:18:37 +01:00
  • c40372fc0d code cleanup Daniel Gultsch 2015-12-23 22:30:14 +01:00
  • f46cbb38a9 show certificate information Daniel Gultsch 2015-12-23 19:18:53 +01:00
  • d0bad09f13 save certificate when verifying with x509 Daniel Gultsch 2015-12-23 17:41:26 +01:00
  • 1867571368 version bump to 1.8.2 Daniel Gultsch 2015-12-20 19:37:33 +01:00
  • ae491764f2 pulled translations from transifex Daniel Gultsch 2015-12-20 19:37:27 +01:00
  • 534013fd0c store identity key in XmppAxolotlSession instead of the fingerprint Daniel Gultsch 2015-12-19 15:44:11 +01:00
  • ade89beb96 use presence name not server name when verification is being used Daniel Gultsch 2015-12-19 13:07:38 +01:00
  • 15c8cb8ac6 add more debugging to certificate checks after new omemo session was established Daniel Gultsch 2015-12-19 12:44:55 +01:00
  • e8bf5cada4 only offer plain and omemo encryption when x509 verification is enabled Daniel Gultsch 2015-12-19 12:44:12 +01:00
  • f05f97251c prefer server name over address book name when x509 verification is being used Daniel Gultsch 2015-12-19 12:43:09 +01:00
  • 0ae86b22cb version 1.8.2 + changelog Christian S 2015-12-18 08:33:01 +01:00
  • 43e1330e16 changed app name in readme Christian S 2015-12-18 08:30:37 +01:00