aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* refactored the message adapter a bitiNPUTmice2014-12-031-32/+33
|
* set nick and autojoin=true for new bookmarksiNPUTmice2014-12-031-0/+4
|
* made muc parser more compatible with legacy mucs?! (whatever that is exactly)iNPUTmice2014-12-031-3/+1
|
* Make sure SASL tokenizer strips stringsSam Whited2014-12-022-1/+5
| | | | Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==')
* worked around concurrent modification exceptioniNPUTmice2014-12-031-11/+11
|
* fixed another npe in hasBookmarkiNPUTmice2014-12-031-2/+3
|
* Merge pull request #740 from SamWhited/jidrpfixDaniel Gultsch2014-12-031-163/+165
|\ | | | | Fix RFC 6122 implementation
| * Allow JIDs such as "example.net/@"Sam Whited2014-12-021-3/+2
| |
| * "example.net/@/" should be a valid JID.Sam Whited2014-12-021-164/+166
| | | | | | | | Retab JID file
| * Fix RFC 6122 implementationSam Whited2014-12-021-4/+5
| | | | | | | | JID resourceparts should be able to contain "@" and "/" characters
* | Merge pull request #743 from weiss/update-german-translationsDaniel Gultsch2014-12-031-2/+4
|\ \ | | | | | | Update/improve German translations
| * | Update/improve German translationsHolger Weiß2014-12-021-2/+4
| |/
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-12-032-32/+108
|\| | | | | | | development
| * 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
* | | safety net in joinMuciNPUTmice2014-12-031-4/+6
| | |
* | | clean up getProposedNickiNPUTmice2014-12-031-6/+5
| | |
* | | fixed potential npes in message parseriNPUTmice2014-12-031-2/+7
| | |
* | | cleaned up avatar / tile creationiNPUTmice2014-12-032-20/+9
|/ /
* | fixed #728iNPUTmice2014-12-011-5/+2
| |
* | bumped cap version as well0.9.1iNPUTmice2014-12-011-1/+1
| |
* | clear encrypted messages on reinitiNPUTmice2014-12-011-2/+13
| |
* | worked around rare npeiNPUTmice2014-12-011-5/+12
| |
* | fixed npe if roster jid couldnt be parsediNPUTmice2014-12-011-8/+5
| |
* | fixed italian translationiNPUTmice2014-12-011-5/+5
| |
* | Merge pull request #726 from Elinvention/developmentDaniel Gultsch2014-12-012-10/+89
|\ \ | | | | | | Update Italian translations
| * | 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
| |/
* | do not query service info from main server againiNPUTmice2014-12-011-5/+3
| |
* | don't request fragment before updatingiNPUTmice2014-11-301-6/+2
|/
* Merge pull request #721 from SamWhited/warning_fixesDaniel Gultsch2014-11-294-6/+14
|\ | | | | Warning "fixes"
| * Accessibility: Add missing image descriptionsSam Whited2014-11-293-3/+8
| |
| * Misc. "fixes" to correct warnings.Sam Whited2014-11-291-3/+6
| |
* | Merge pull request #718 from beriain/developmentDaniel Gultsch2014-11-291-0/+6
|\ \ | | | | | | Update basque translation
| * | Update basque translationAitor Beriain2014-11-271-0/+6
| |/
* | fixed npe for broken bookmarksiNPUTmice2014-11-291-7/+8
| |
* | fix for concurrency issueiNPUTmice2014-11-291-1/+1
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-271-1/+1
|\ | | | | | | development
| * Update german translationskriztan2014-11-261-1/+1
| | | | | | modified translations a bit
* | fixed npe. fixed #717iNPUTmice2014-11-271-5/+6
| |
* | create conversation with bare jidiNPUTmice2014-11-271-1/+1
| |
* | use getAttributeAsJid methodiNPUTmice2014-11-271-6/+1
|/
* Merge pull request #713 from betheg/mucDaniel Gultsch2014-11-245-1/+65
|\ | | | | MUC: do not add yourself to the muc user list.
| * add an listener for the muc roster update.Michael2014-11-234-1/+63
| | | | | | | | | | this is for the ConferenceDetailsActivity to show precence updates immediately.
| * MUC: do not add yourself to the muc user list.Michael2014-11-231-0/+2
| |
* | Merge pull request #714 from betheg/muc_bookmark_cdDaniel Gultsch2014-11-242-0/+49
|\ \ | | | | | | MUC: option to set/delete bookmark in conference details.
| * | MUC: option to set/delete bookmark in conference details.Michael2014-11-232-0/+49
| |/