sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 449c2a544b fixed #321 - delete otr fingerprints iNPUTmice 2014-09-07 23:08:40 +0200
  • 2cebac6a23 Fix for user ids in API Dominik Schürmann 2014-09-07 20:07:13 +0200
  • ac927df10a Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib Dominik Schürmann 2014-09-07 19:23:20 +0200
  • f6d678cbe5 Fix nullpointer with new OpenPgpSignatureResult version Dominik Schürmann 2014-09-07 19:23:04 +0200
  • 5fe3f207d4 Merge pull request #426 from betheg/remove_strings Daniel Gultsch 2014-09-07 17:13:10 +0200
  • 90947597e5 fixed #425 iNPUTmice 2014-09-07 16:53:10 +0200
  • f4d86ecff3 deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. Michael 2014-09-07 15:58:59 +0200
  • 27ad80afc2 trying to avoid rejectedexection iNPUTmice 2014-09-07 15:11:40 +0200
  • 04665b59c8 Merge pull request #424 from betheg/bookmark_password Daniel Gultsch 2014-09-07 14:50:09 +0200
  • ecd613dcdd MUC: set the password from bookmarks. Michael 2014-09-07 14:06:23 +0200
  • d9990e6cd8 made shareing text with conferences possible again iNPUTmice 2014-09-07 13:01:09 +0200
  • b334ebd0fa added missing breaks oO iNPUTmice 2014-09-07 12:43:01 +0200
  • 890fb9a1b4 fixed npe iNPUTmice 2014-09-07 00:09:12 +0200
  • a2987edd95 readme formating iNPUTmice 2014-09-06 20:07:31 +0200
  • 35553722e4 added recent contributors iNPUTmice 2014-09-06 20:06:22 +0200
  • 9a945af6b9 Merge branch 'development' of github.com:siacs/Conversations into development iNPUTmice 2014-09-06 18:21:38 +0200
  • 0e5a0a07fd made otr a little bit more solid when there is no presence subscription iNPUTmice 2014-09-06 18:21:31 +0200
  • dfc5942bda Merge pull request #422 from betheg/muc_password Daniel Gultsch 2014-09-06 15:11:43 +0200
  • 375ec3a686 MUC: set password from invite message. Michael 2014-09-05 22:07:35 +0200
  • dc02137106 warn user if no presence subscription exists iNPUTmice 2014-09-05 13:29:45 +0200
  • 34228d0e78 improved logging for avatar fetches iNPUTmice 2014-09-05 13:29:20 +0200
  • b8d289a932 fixed #342 - otr with facebook and other services without resources iNPUTmice 2014-09-04 19:56:37 +0200
  • 01389e900b reconnect accounts when resource has been changed in settings iNPUTmice 2014-09-04 13:56:36 +0200
  • 9817251ed5 made muc password dialog hide the password (password field) iNPUTmice 2014-09-04 11:46:13 +0200
  • 7a3bc5dc45 nick parsing (xep 0172) also enabled for messages and for pep iNPUTmice 2014-09-04 10:50:06 +0200
  • 1d6c09e8ff Merge pull request #397 from GZep/development Daniel Gultsch 2014-09-04 10:28:13 +0200
  • 50f90d37b8 Merge pull request #417 from emdete/unicode_emoticons Daniel Gultsch 2014-09-04 10:16:28 +0200
  • ec234ebf01 Pull from transifex Dominik Schürmann 2014-09-04 01:28:06 +0200
  • 6b9219c5f4 added support for password protected muc - fixed #203 and fixed #395 iNPUTmice 2014-09-03 19:35:45 +0200
  • f19b1fb823 changed order of snackbar hints iNPUTmice 2014-09-03 18:58:46 +0200
  • 0a2c73f246 improve emo mapping M. Dietrich 2014-09-03 17:44:38 +0200
  • 0a686bc71c use class, use codepoint M. Dietrich 2014-09-03 17:29:13 +0200
  • 0f4ba6101c set openpgp-api-lib to a version that actually works iNPUTmice 2014-09-03 16:13:49 +0200
  • ceddf99aa3 set openpgp-api-lib to a version that actually works iNPUTmice 2014-09-03 16:13:49 +0200
  • 584984807e make pattern static M. Dietrich 2014-09-03 16:10:50 +0200
  • cb3ba4045e improve regex, implement pattern cache M. Dietrich 2014-09-03 15:39:46 +0200
  • 2b941d19f8 more openpgp bug fixes iNPUTmice 2014-09-03 15:33:44 +0200
  • 253438e698 more openpgp bug fixes iNPUTmice 2014-09-03 15:33:44 +0200
  • 664c9c434f avoiding resource conflicts iNPUTmice 2014-09-03 14:57:40 +0200
  • f1494f83ff fixed pgp signature creation iNPUTmice 2014-09-03 13:05:22 +0200
  • 5ae62f18b4 fixed pgp signature creation iNPUTmice 2014-09-03 13:05:22 +0200
  • 1a09a4706b added ability to disable notifications for specific conversations - fixed #322 iNPUTmice 2014-09-03 12:36:54 +0200
  • 1f378bffc8 made emoticon parsing enableable - default false iNPUTmice 2014-09-03 09:15:07 +0200
  • c1453db5df Merge branch 'betheg-unused_resources' into development iNPUTmice 2014-09-02 16:51:05 +0200
  • 3235c67e81 Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources iNPUTmice 2014-09-02 16:50:19 +0200
  • 9dd15131e1 Update README Dominik Schürmann 2014-09-02 16:12:35 +0200
  • bba03f2f2f Update README Dominik Schürmann 2014-09-02 16:11:46 +0200
  • 3bcf7266c3 Update README Dominik Schürmann 2014-09-02 16:11:07 +0200
  • 97b52abaf9 fixed #410 by removing that config option iNPUTmice 2014-09-02 16:00:03 +0200
  • 0ae852a633 refactored share with activity iNPUTmice 2014-09-02 15:51:20 +0200
  • 567827ffca fixed #406 iNPUTmice 2014-09-02 11:26:56 +0200
  • c62937016b rotate avatars iNPUTmice 2014-09-02 11:19:05 +0200
  • 2c9b2e6bf8 fixed #406 iNPUTmice 2014-09-02 11:26:56 +0200
  • f888b167c6 rotate avatars iNPUTmice 2014-09-02 11:19:05 +0200
  • 6045bcc2eb Merge pull request #408 from emdete/unicode_emoticons Daniel Gultsch 2014-09-02 10:39:13 +0200
  • a7b3aa343e add all whitespaces in regex M. Dietrich 2014-09-02 01:16:33 +0200
  • 6291ebf1a3 Merge pull request #380 from emdete/unicode_emoticons Daniel Gultsch 2014-09-01 23:58:00 +0200
  • 546082147a transform ascii to emoticons (on display only) M. Dietrich 2014-09-01 23:48:42 +0200
  • 8f0882eb1c removed unused string resources. Michael 2014-09-01 19:49:47 +0200
  • d42ea45b1c fixed #403 iNPUTmice 2014-09-01 13:51:49 +0200
  • a7881754f5 fixed #403 iNPUTmice 2014-09-01 13:51:49 +0200
  • 0ffdb03aa3 Merge pull request #402 from emdete/remove_poormans_tostring Daniel Gultsch 2014-09-01 10:58:26 +0200
  • 2acf510ea9 optimize string operations a bit M. Dietrich 2014-09-01 10:40:45 +0200
  • 8b36d28668 Changelog Dominik Schürmann 2014-08-31 23:49:34 +0200
  • 575b9d2279 Add userIds to OpenPgpSignatureResult Dominik Schürmann 2014-08-31 23:48:21 +0200
  • eda2470c4d Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib Dominik Schürmann 2014-08-31 23:39:59 +0200
  • e0be0f648a Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN Dominik Schürmann 2014-08-31 23:39:56 +0200
  • 271b0f9c58 updated readme iNPUTmice 2014-08-31 22:37:34 +0200
  • 5b24534ab6 Contact presenceName property Gayaz Yusipov 2014-08-31 23:14:05 +0400
  • 3558fa5f5b deleted unnecessary log iNPUTmice 2014-08-31 21:02:14 +0200
  • e30599b993 Merge pull request #401 from jelmer/dutch-updates Daniel Gultsch 2014-08-31 19:50:56 +0200
  • 86b85062ad Update Dutch translations. Jelmer Vernooij 2014-08-31 19:45:54 +0200
  • 94389ac22a show merged time and status in message adapter iNPUTmice 2014-08-31 18:55:15 +0200
  • bda7724e31 improvements for merge conditions iNPUTmice 2014-08-31 18:21:46 +0200
  • 28fa48704d add missing blank before nick iNPUTmice 2014-08-31 17:48:00 +0200
  • 4793081c2c Merge pull request #400 from xsrc/development Daniel Gultsch 2014-08-31 17:40:29 +0200
  • 3e3451bcff Smarter nickname highlight insert in confernces Bahtiar `kalkin-` Gadimov 2014-08-31 17:24:52 +0200
  • 1ac5be4855 some code cleanup iNPUTmice 2014-08-31 16:28:21 +0200
  • 8d456085e5 Merge pull request #391 from betheg/fix_typo Daniel Gultsch 2014-08-31 15:56:41 +0200
  • 5ab025d008 Merge pull request #398 from betheg/fix_res Daniel Gultsch 2014-08-31 15:56:13 +0200
  • 1cc16161ef require encrypted to be the same for messages to get merged iNPUTmice 2014-08-31 15:54:53 +0200
  • 8f8d4e320d experimental message merging iNPUTmice 2014-08-31 14:29:12 +0200
  • fb3c754ea8 Merge pull request #1 from Flowdalic/flow Dominik Schürmann 2014-08-30 18:56:17 +0200
  • 733041aee4 fix: warning: string 'publish_avatar' has no default translation. also altered the types of resources from array to string-array in some res-files. Michael 2014-08-30 17:38:21 +0200
  • d15482c22a Add my Real-name to the Copyright statement Florian Schmaus 2014-08-30 15:19:43 +0200
  • 969cba5ee6 Merge remote-tracking branch 'upstream/development' into fix_typo Michael 2014-08-30 14:00:53 +0200
  • ec6220969d XEP-0172 Gayaz Yusipov 2014-08-30 14:26:46 +0400
  • 9eafb10086 version bump to 0.7-alpha iNPUTmice 2014-08-30 09:26:01 +0200
  • c494f4f7ae Merge branch 'sm' into development iNPUTmice 2014-08-30 09:24:58 +0200
  • 4435b0055e reset unsend messages to waiting iNPUTmice 2014-08-27 19:25:58 +0200
  • 9075d3854d properly set stanza count on session resume iNPUTmice 2014-08-27 14:51:00 +0200
  • 4a6a6c8403 basic message acking iNPUTmice 2014-08-26 16:52:42 +0200
  • 9de77b190b proper namespaces for xep-0352 iNPUTmice 2014-08-29 12:21:29 +0200
  • 6d82a69ba3 send inactive or active on every connect and resume iNPUTmice 2014-08-28 22:23:18 +0200
  • 265bd06250 added basic csi iNPUTmice 2014-08-26 17:43:44 +0200
  • 9ad5c6925d version bump to 0.6 with changelogs 0.6 iNPUTmice 2014-08-30 08:51:55 +0200
  • 8840d082ba brought npe catcher back for kxml parser iNPUTmice 2014-08-30 08:31:05 +0200
  • 3714947d5f Merge remote-tracking branch 'upstream/development' into fix_typo Michael 2014-08-29 23:30:47 +0200
  • 5450a2ae46 fixed link to old resource iNPUTmice 2014-08-29 14:05:10 +0200
  • b0d777d9ca fixed npe iNPUTmice 2014-08-29 12:14:10 +0200