aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| | |
* | | refactored UiHelperDaniel Gultsch2015-01-071-2/+10
|/ /
* | fixed bug in new ping strategyDaniel Gultsch2015-01-061-3/+3
| |
* | mark sent images as sent_received instead of sentDaniel Gultsch2015-01-061-2/+1
| | | | | | | | fixed #842
* | Merge pull request #841 from BenoitBouvarel/patch-2Daniel Gultsch2015-01-061-1/+86
|\ \ | | | | | | Update strings.xml
| * | Update strings.xmlBenoit Bouvarel2015-01-061-1/+1
| | | | | | | | | char ">" was missing at line 285
| * | Update strings.xmlBenoit Bouvarel2015-01-051-1/+86
| | | | | | | | | French translation updated
* | | run invalidateOptionsMenu on uiThreadDaniel Gultsch2015-01-061-1/+1
| | |
* | | fixed potential NPEs in ShareWithActivityDaniel Gultsch2015-01-061-4/+5
|/ /
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵Daniel Gultsch2015-01-051-16/+16
|\ \ | | | | | | | | | development
| * \ Merge pull request #840 from kriztan/patch-1Daniel Gultsch2015-01-051-16/+16
| |\ \ | | | | | | | | corrected German spellings
| | * | corrected German spellingsChristian Schneppe2015-01-051-16/+16
| |/ / | | | | | | and shorten some strings
* | | added debug info + possible platform bug work arounds to message adapterDaniel Gultsch2015-01-051-0/+10
| | |
* | | reworked ping scheduling strategy. very experimentalDaniel Gultsch2015-01-051-61/+32
| | |
* | | avoid requesting blocklist after stream resumptionDaniel Gultsch2015-01-052-27/+24
|/ /
* | prevent QR code parser from crashing fixed #839Daniel Gultsch2015-01-051-6/+13
| |
* | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵Daniel Gultsch2015-01-054-78/+130
| | | | | | | | display role
* | Merge pull request #838 from shtrom/pebble-notifications-squashDaniel Gultsch2015-01-051-2/+28
|\ \ | | | | | | Send notification to Pebble on new message