aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Update german translationskriztan2014-12-251-0/+20
|
* Add more server compatibility info.Sam Whited2014-12-233-4/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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'
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-224-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* 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
|/
* Czech translation updatedJaroslav Lichtblau2014-12-181-0/+8
| | | | added missing strings
* Update german translationskriztan2014-12-181-0/+8
|
* made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-171-0/+1
|
* smoothed out scrolling a bitiNPUTmice2014-12-171-0/+1
|
* Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵iNPUTmice2014-12-152-2/+29
|\ | | | | | | into SamWhited-quiet-hours
| * Add quiet hours featureSam Whited2014-12-142-2/+29
| |
* | Merge pull request #775 from kruks23/translation1Daniel Gultsch2014-12-151-33/+33
|\ \ | | | | | | Update spanish translations.
| * | Update spanish translations.kruks232014-12-131-33/+33
| |/
* / fixed typo in italian translationdrizzt2014-12-151-1/+1
|/ | | s/gallaria/galleria/
* Update spanish translations.kruks232014-12-091-6/+6
|
* Update/improve German translationsHolger Weiß2014-12-021-2/+4
|
* Merge pull request #737 from kruks23/translation2Daniel Gultsch2014-12-021-9/+11
|\ | | | | Update spanish translations
| * Update spanish translationskruks232014-12-011-9/+11
| |
* | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-021-23/+97
|\ \ | |/ |/| Updated Czech translation file
| * pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| |
| * Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
| | | | | | | | | | added missing strings fixing typos, improvements for better understanding
* | fixed italian translationiNPUTmice2014-12-011-5/+5
| |
* | Removed pref_about_message which is not translatableElinvention2014-11-301-24/+0
| |
* | Added missing italian translations with some minor fixes to existing onesElinvention2014-11-302-10/+113
|/
* Merge pull request #721 from SamWhited/warning_fixesDaniel Gultsch2014-11-293-3/+8
|\ | | | | Warning "fixes"
| * Accessibility: Add missing image descriptionsSam Whited2014-11-293-3/+8
| |
* | Update basque translationAitor Beriain2014-11-271-0/+6
|/
* Update german translationskriztan2014-11-261-1/+1
| | | modified translations a bit
* Merge pull request #714 from betheg/muc_bookmark_cdDaniel Gultsch2014-11-241-0/+10
|\ | | | | MUC: option to set/delete bookmark in conference details.
| * MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+10
| |
* | Update german translationskriztan2014-11-231-0/+2
|/
* Update spanish translationskruks232014-11-221-2/+8
|
* verify contacts key only on initiating side of smpiNPUTmice2014-11-211-0/+2
|
* Update german translationskriztan2014-11-201-16/+20
|
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-0/+4
|
* Merge pull request #691 from kruks23/developmentDaniel Gultsch2014-11-191-5/+11
|\ | | | | Update spanish translation
| * Update spanish translationskruks232014-11-191-4/+4
| |
| * Update spanish translationskruks232014-11-181-2/+8
| |
* | Merge pull request #692 from kriztan/patch-3Daniel Gultsch2014-11-191-0/+41
|\ \ | | | | | | Update german translations
| * | Update german translationskriztan2014-11-191-0/+41
| |/
* / Update basque translationAitor Beriain2014-11-191-0/+56
|/
* put error notification into notification serviceiNPUTmice2014-11-184-0/+0
|
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-12/+7
|
* properly remove conversations context menuiNPUTmice2014-11-182-11/+7
|
* added rendered versions of new iconsiNPUTmice2014-11-188-0/+0
|
* context menu for conversations. fixed #630iNPUTmice2014-11-182-0/+12
|
* context menu for muc participants + refactor trueCounterpart to use Jid classiNPUTmice2014-11-171-1/+4
|
* synchronized around cache clear in avatar serviceiNPUTmice2014-11-171-0/+4
|
* Merge pull request #680 from ferdev1/patch-2Daniel Gultsch2014-11-171-2/+2
|\ | | | | Fix string 2