aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* put Conversations into background mode earlierDaniel Gultsch2015-01-025-19/+44
|
* prefer PLAIN over DIGEST-MD5Daniel Gultsch2015-01-022-3/+3
| | | | | DIGEST-MD5 seems to be broken for a lot of cases (OpenFire) switched priority of PLAIN to not cause any security errors
* fixed layout fileDaniel Gultsch2015-01-021-1/+1
|
* improved OTR verification part oneDaniel Gultsch2015-01-0212-352/+403
|
* Merge remote-tracking branch 'origin/development' into developmentDaniel Gultsch2014-12-3015-22/+8
|\
| * Make `app_name' string untranslatableSam Whited2014-12-2915-22/+8
| | | | | | | | | | | | Remove untranslatable about message Escape single quote in NL translation
* | improved fromServer filterDaniel Gultsch2014-12-301-1/+4
|/
* refactor swithOverToTls stuffDaniel Gultsch2014-12-301-56/+45
|
* fixed npe in block menu itemDaniel Gultsch2014-12-301-1/+1
|
* fixed nl stringsDaniel Gultsch2014-12-301-25/+1
|
* fixed #818Daniel Gultsch2014-12-301-1/+1
|
* Merge pull request #812 from kriztan/patch-1Daniel Gultsch2014-12-301-0/+4
|\ | | | | Update german translations
| * Update german translationskriztan2014-12-271-0/+4
| |
* | Merge pull request #813 from plsng/translationDaniel Gultsch2014-12-302-114/+292
|\ \ | | | | | | Update Dutch translations
| * | Update Dutch translationsNathan Follens2014-12-292-10/+10
| | |
| * | Update Dutch translationsNathan Follens2014-12-272-113/+291
| |/
* | Merge pull request #814 from kruks23/translation1Daniel Gultsch2014-12-301-3/+27
|\ \ | | | | | | Update spanish translations
| * | Update spanish translationssergio2014-12-271-3/+27
| |/
* / Fix typo in method nameSam Whited2014-12-295-9/+9
|/
* code cleanup for change password stuffDaniel Gultsch2014-12-253-15/+22
|
* added callback to change account password to notify UI on success / failureDaniel Gultsch2014-12-254-27/+66
|
* Add ability to change password on serverSam Whited2014-12-259-88/+139
| | | | Fixes #260
* proper call to invalidateViews()Daniel Gultsch2014-12-251-1/+1
|
* catch another exception in fingerprint generationDaniel Gultsch2014-12-251-1/+1
|
* Merge pull request #810 from kriztan/patch-2Daniel Gultsch2014-12-251-0/+20
|\ | | | | Update german translations
| * Update german translationskriztan2014-12-251-0/+20
| |
* | Show server info option when blocking is unavailablepulser2014-12-241-2/+4
|/ | | | | | | | Current head of development branch doesn't show server information if blocking is disabled. This is due to slightly wrong logic on an if statement. This patch ensures only the blocking option is disabled when blocking is not supported by the server, and that the feature remains available.
* Don't allow user to register domain only jidsSam Whited2014-12-231-0/+5
|
* Don't show menu on create account screenSam Whited2014-12-231-0/+3
|
* Remove old JID validatorSam Whited2014-12-233-105/+77
|
* Add more server compatibility info.Sam Whited2014-12-234-6/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | Hide server info behind a checkbox. Add XEP-0352 support to the server info list Add XEP-0237 to server info list Add XEP-0352 support to the server info list Add MaM and Blocking to the account XEPs list Also add a toggle button to hide some of the list Rebase on current codebase Make MAM string more descriptive Change show more button to checkbox menu item Shorten `MAM (History)' to `MAM' Order XEP list and hide all by default Supress warning (which is wrong anyways) Change `Show more' to `Show more info'
* made method private that is no longer required to be publiciNPUTmice2014-12-231-1/+1
|
* Simplify roster handling codeSam Whited2014-12-223-121/+97
| | | | | | Merge result handling code into IqParser Fixes #20
* Fix NPEs in blocking codeSam Whited2014-12-222-2/+4
|
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-2242-903/+1481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
* get rid of special self presence object and incorporate that into rosteriNPUTmice2014-12-203-75/+46
|
* more null checks for otr fingerprintsiNPUTmice2014-12-201-1/+1
|
* don't include empty fingerprints in list of otrfingerprintsiNPUTmice2014-12-201-4/+6
|
* fixed another break continue bugiNPUTmice2014-12-201-3/+2
|
* inject ui callback into running mam queryiNPUTmice2014-12-203-4/+6
|
* Merge pull request #794 from svetlemodry/developmentDaniel Gultsch2014-12-201-2/+2
|\ | | | | Czech image transfer string fix
| * Czech image transfer string fixJaroslav Lichtblau2014-12-191-2/+2
| |
* | Update spanish translationskruks232014-12-201-4/+12
| |
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-12-192-0/+16
|\| | | | | | | development
| * Czech translation updatedJaroslav Lichtblau2014-12-181-0/+8
| | | | | | | | added missing strings
| * Update german translationskriztan2014-12-181-0/+8
| |
* | fixed #755iNPUTmice2014-12-191-1/+1
|/
* clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-173-4/+12
|
* show error if jid couldn't be parsed in new contact dialogiNPUTmice2014-12-171-15/+10
|
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-12-173-18/+19
|\ | | | | | | development
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 08:41:36 +0000