aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Czech translationJaroslav Lichtblau2015-01-121-9/+37
| | | | updated
* Merge pull request #868 from SamWhited/ignore-extra-translationsDaniel Gultsch2015-01-121-1/+1
|\ | | | | Don't fail on extra translations
| * Don't fail on extra translationsSam Whited2015-01-121-1/+1
| |
* | catch bug in guessContentTypeDaniel Gultsch2015-01-121-1/+6
|/
* context menu for files and offered files. fixed #848 fixed #849Daniel Gultsch2015-01-123-17/+24
|
* reworked message preview / message meta information (ie file offered, ↵Daniel Gultsch2015-01-125-168/+171
| | | | | | received * file) fixed #837
* Merge pull request #866 from SamWhited/xep0245Daniel Gultsch2015-01-125-159/+206
|\ | | | | Add XEP-0245 (/me command) support
| * Add XEP-0245 (/me command) supportSam Whited2015-01-115-159/+206
| |
* | do not check image file size over http if accepted file size is 0Daniel Gultsch2015-01-112-6/+11
| |
* | keep proper image file extensionDaniel Gultsch2015-01-114-26/+39
|/
* updated travis file to build with android-m2repositoryDaniel Gultsch2015-01-111-0/+1
|
* shortened some stringDaniel Gultsch2015-01-112-2/+3
|
* fixed #860Daniel Gultsch2015-01-101-0/+1
|
* use latest support libraryDaniel Gultsch2015-01-101-1/+1
|
* make room persistant when changing subject or other muc optionsDaniel Gultsch2015-01-103-16/+26
|
* don't crash when selecting a conversation by uuid did not workDaniel Gultsch2015-01-101-16/+20
|
* fixed regression in tablet uiDaniel Gultsch2015-01-091-0/+2
|
* Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-095-5/+27
| | | | (default == off)
* code cleanup for jingle proxy discoveryDaniel Gultsch2015-01-094-99/+72
|
* ensure that everyone is member before making a room privateDaniel Gultsch2015-01-093-6/+32
|
* modified readme to link to transifexDaniel Gultsch2015-01-091-10/+1
|
* make project translatable via transifexDaniel Gultsch2015-01-0917-475/+20
|
* added missing drawablesDaniel Gultsch2015-01-084-0/+0
|
* allow for very basic muc configurationDaniel Gultsch2015-01-086-128/+239
|
* code cleanupDaniel Gultsch2015-01-082-14/+15
|
* kick after banDaniel Gultsch2015-01-084-1/+46
|
* fixed german translationDaniel Gultsch2015-01-081-2/+2
|
* some clean ups for affiliation change context menuDaniel Gultsch2015-01-083-6/+16
|
* Merge pull request #851 from kriztan/patch-2Daniel Gultsch2015-01-071-9/+12
|\ | | | | Updated German translations for more muc options
| * Updated German translations for more muc optionsChristian S.2015-01-071-9/+12
| |
* | Merge pull request #852 from SamWhited/ellipsisDaniel Gultsch2015-01-071-2/+2
|\ \ | | | | | | s/.../…/ in CS strings
| * | s/.../…/ in CS stringsSam Whited2015-01-071-2/+2
| |/ | | | | | | [ci skip]
* | Merge pull request #850 from plsng/dutchDaniel Gultsch2015-01-071-0/+25
|\ \ | |/ |/| Update Dutch translations
| * Update Dutch translationsNathan Follens2015-01-071-0/+25
| |
* | more muc optionsDaniel Gultsch2015-01-076-25/+99
| | | | | | | | | | | | * show invite button only with admin privileges or on public conferences * Offer to ban user in public conferences. Thanks to @betheg for the awesome ground work for this
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵Daniel Gultsch2015-01-071-4/+15
|\ \ | | | | | | | | | development
| * \ Merge pull request #847 from kriztan/patch-1Daniel Gultsch2015-01-071-4/+15
| |\ \ | | |/ | |/| Updated German translations...
| | * Updated German translations...Christian S2015-01-071-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation? I've changed the translations. Updated German translations... Updated German translations...
* | | fixed invitesDaniel Gultsch2015-01-071-37/+24
|/ /
* | Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-074-4/+20
|\ \ | | | | | | Add materials theme for v21 devices
| * | Update travis config to use current build toolsSam Whited2015-01-061-1/+2
| | |
| * | Add materials themeSam Whited2015-01-063-3/+18
| | |
* | | basic affiliation changes in mucDaniel Gultsch2015-01-076-26/+160
| |/ |/|
* | reset next encryption when archiving conversationsDaniel Gultsch2015-01-072-1/+3
| |
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵Daniel Gultsch2015-01-072-0/+10
|\ \ | | | | | | | | | development
| * \ Merge pull request #846 from kruks23/translation4Daniel Gultsch2015-01-071-0/+5
| |\ \ | | |/ | |/| Update spanish translation
| | * Update affiliation in MUC details and advance modekruks232015-01-071-0/+5
| | |
| * | Merge pull request #843 from svetlemodry/developmentDaniel Gultsch2015-01-061-0/+5
| |\ \ | | | | | | | | Czech translation for - show affiliation instead of role in MucDetails
| | * | Czech translation for - show affiliation instead of role in MucDetailsJaroslav Lichtblau2015-01-061-0/+5
| |/ /
* | | use copyonwritearraylist in for phone helperDaniel Gultsch2015-01-071-2/+2
| | |