aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | trim message bodys on displayDaniel Gultsch2015-02-071-1/+1
| |/
* | Merge master-originsteckbrief2015-02-204-19/+164
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * don't disable any ciphersiNPUTmice2015-02-021-3/+4
| |
| * fixed text preview for imagesiNPUTmice2015-02-011-1/+1
| |
| * fix mergable() for /me command.Michael2015-01-251-2/+3
| |
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+8
| |
| * use same helper methods for images and filesiNPUTmice2015-01-181-21/+8
| |
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+4
| |\ | | | | | | Added new file type names for file transfers
| | * Added new file type names for file transfersChristian S2015-01-181-0/+4
| | | | | | | | | | | | | | | - apk - vcard
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-2/+2
| |/
| * Correct the download file string on notificationsSam Whited2015-01-171-10/+12
| | | | | | | | Fixes #896
| * handle muc nicks with white spaces. fixed #884iNPUTmice2015-01-141-2/+2
| |
| * Harden the TLS connection cipher suitesSam Whited2015-01-141-5/+16
| |
| * catch bug in guessContentTypeDaniel Gultsch2015-01-121-1/+6
| |
| * reworked message preview / message meta information (ie file offered, ↵Daniel Gultsch2015-01-121-0/+110
| | | | | | | | | | | | received * file) fixed #837
| * code cleanup for jingle proxy discoveryDaniel Gultsch2015-01-091-0/+1
| |
| * refactored UiHelperDaniel Gultsch2015-01-071-2/+10
| |
| * prevent QR code parser from crashing fixed #839Daniel Gultsch2015-01-051-6/+13
| |
* | Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-037-176/+31
|\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
| * improved OTR verification part oneDaniel Gultsch2015-01-021-1/+1
| |
| * Add ability to change password on serverSam Whited2014-12-251-0/+1
| | | | | | | | Fixes #260
| * Remove old JID validatorSam Whited2014-12-231-14/+0
| |
| * Simplify roster handling codeSam Whited2014-12-221-0/+1
| | | | | | | | | | | | Merge result handling code into IqParser Fixes #20
| * Add support for XEP-0191 (Blocking command)Sam Whited2014-12-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * more patches for dns helperiNPUTmice2014-12-141-13/+19
| |
| * possible dns fixesiNPUTmice2014-12-141-2/+11
| |
| * avoiding concurrent modificationiNPUTmice2014-12-131-4/+1
| |
| * cleanup: removed unused emoticon parsingiNPUTmice2014-12-091-42/+0
| |
| * cleanup: removed stream compressioniNPUTmice2014-12-092-149/+0
| |
* | remaining part of my patchlookshe2015-01-031-1/+101
|/
* close cursors after querying phone dbiNPUTmice2014-12-031-0/+2
|
* cleaned up avatar / tile creationiNPUTmice2014-12-031-0/+3
|
* remove unused imports.Michael2014-11-212-21/+0
|
* put error notification into notification serviceiNPUTmice2014-11-181-42/+0
|
* fixed regression of xmpp uris not workingiNPUTmice2014-11-161-3/+3
|
* happy hanukkahiNPUTmice2014-11-161-0/+7
|
* Don't escape passwords in SASLSam Whited2014-11-151-1/+1
| | | | Fixes #671
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-0/+79
|
* parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵iNPUTmice2014-11-161-0/+9
| | | | shareable uri where ever possible
* Cache SCRAM-SHA-1 keys for current sessionSam Whited2014-11-151-0/+4
|
* Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-151-34/+0
|\
| * initial smp supportiNPUTmice2014-11-111-34/+0
| |
* | Add SCRAM-SHA1 supportSam Whited2014-11-141-2/+29
| | | | | | | | | | | | | | Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
* | Refactor authentication codeSam Whited2014-11-121-59/+1
|/
* more refactoring for presence selection. removed getTo, getFrom and getJid ↵iNPUTmice2014-11-101-0/+2
| | | | from Element
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-092-2/+2
| | | | Remove `Account.getFullJid()'
* Update more files to use JID objectsSam Whited2014-11-092-13/+16
|
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-6/+8
|
* Merge branch 'gradle' into developmentSam Whited2014-10-302-32/+179
| | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib
* Make conversations the root projectSam Whited2014-10-2212-0/+1289
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 22:42:59 +0000