aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Merge pull request #783 from SamWhited/quiet-hoursDaniel Gultsch2014-12-173-18/+19
| |\ | | | | | | Update summary in TimePreference change listener
| | * Handle time comparisons using longsSam Whited2014-12-162-13/+8
| | |
| | * Update summary in TimePreference change listenerSam Whited2014-12-151-5/+11
| | | | | | | | | | | | | | | | | | Ensures the summary is updated even if we change the time preference programatically; also allows other places to stop the summary from being updated by setting a new listener.
* | | made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-174-21/+48
| | |
* | | smoothed out scrolling a bitiNPUTmice2014-12-173-23/+45
|/ /
* | properly detect images in share withiNPUTmice2014-12-171-6/+6
| |
* | Merge branch 'issue756' of https://github.com/SamWhited/Conversations into ↵iNPUTmice2014-12-172-25/+37
|\ \ | | | | | | | | | SamWhited-issue756
| * | Allow sending of any filetype via intentSam Whited2014-12-152-25/+37
| |/ | | | | | | Fixes #756
* / properly count mam messagesiNPUTmice2014-12-172-4/+13
|/
* go through mam history page by page. load mam dynamically on scrolliNPUTmice2014-12-155-43/+108
|
* Merge pull request #782 from SamWhited/quiet-hoursDaniel Gultsch2014-12-151-3/+3
|\ | | | | Make some magic number constants final
| * Make some magic number constants finalSam Whited2014-12-151-3/+3
| |
* | fixed crashing on unparsed jidsiNPUTmice2014-12-151-4/+4
| |
* | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵iNPUTmice2014-12-151-68/+64
|\| | | | | | | into SamWhited-quiet-hours
| * Make silent notification when quiet hours are onSam Whited2014-12-151-68/+64
| | | | | | | | | | Notify, just don't play a sound or vibrate Also make the Java annoyingly verbose... I can't help myself... ahh!
* | migrated more jid parsing to use getAttributeAsJid. added error loggingiNPUTmice2014-12-154-32/+8
| |
* | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵iNPUTmice2014-12-154-29/+176
|\| | | | | | | into SamWhited-quiet-hours
| * Add quiet hours featureSam Whited2014-12-144-29/+176
| |
* | fixed history deletion. fixed #780iNPUTmice2014-12-152-1/+11
| |
* | Merge pull request #775 from kruks23/translation1Daniel Gultsch2014-12-151-33/+33
|\ \ | | | | | | Update spanish translations.
| * | Update spanish translations.kruks232014-12-131-33/+33
| | |
* | | Merge pull request #781 from drizzt/patch-1Daniel Gultsch2014-12-151-1/+1
|\ \ \ | | | | | | | | fixed typo in italian translation
| * | | fixed typo in italian translationdrizzt2014-12-151-1/+1
| | | | | | | | | | | | s/gallaria/galleria/
* | | | avoid npe on weird platform bugsiNPUTmice2014-12-151-30/+30
|/ / /
* | | run mam queries only when onlineiNPUTmice2014-12-142-4/+31
| | |
* | | more patches for dns helperiNPUTmice2014-12-141-13/+19
| |/ |/|
* | possible dns fixesiNPUTmice2014-12-142-3/+12
| |
* | refactored the way certain messages are being found within a conversationiNPUTmice2014-12-145-117/+193
| |
* | avoiding concurrent modificationiNPUTmice2014-12-132-6/+3
| |
* | fixed regressioniNPUTmice2014-12-131-3/+3
| |
* | reverse through mam history when loading larger chuncksiNPUTmice2014-12-135-22/+79
| |
* | Merge branch 'feature/mam' into developmentiNPUTmice2014-12-1317-75/+535
|\ \ | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 06:40:21 +0000