aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #885 from SamWhited/display-enter-keyDaniel Gultsch2015-01-142-0/+7
| |\ | | | | | | Add option to swap enter/emoticon key
| | * Add option to swap enter/emoticon keySam Whited2015-01-142-0/+7
| | |
| * | Harden the TLS connection cipher suitesSam Whited2015-01-141-1/+1
| |/
| * Fix bottom padding on about pageSam Whited2015-01-131-1/+1
| |
| * make use of different dimensions for different screen sizesDaniel Gultsch2015-01-1315-114/+56
| |
| * Merge pull request #872 from Elinvention/developmentDaniel Gultsch2015-01-131-25/+104
| |\ | | | | | | Updated Italian translations
| | * Updated Italian translationsElia2015-01-131-25/+104
| | |
| * | Merge pull request #873 from SamWhited/about-margin-fixDaniel Gultsch2015-01-131-4/+4
| |\ \ | | |/ | |/| Use margin instead of padding on about screen
| | * Use margin instead of padding in about screenSam Whited2015-01-121-4/+4
| | |
| * | Czech translationJaroslav Lichtblau2015-01-121-9/+37
| |/ | | | | | | updated
| * context menu for files and offered files. fixed #848 fixed #849Daniel Gultsch2015-01-122-4/+3
| |
| * reworked message preview / message meta information (ie file offered, ↵Daniel Gultsch2015-01-121-5/+8
| | | | | | | | | | | | received * file) fixed #837
| * shortened some stringDaniel Gultsch2015-01-112-2/+3
| |
| * fixed #860Daniel Gultsch2015-01-101-0/+1
| |
| * Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-092-0/+10
| | | | | | | | (default == off)
| * make project translatable via transifexDaniel Gultsch2015-01-0916-475/+12
| |
| * added missing drawablesDaniel Gultsch2015-01-084-0/+0
| |
| * allow for very basic muc configurationDaniel Gultsch2015-01-083-118/+160
| |
| * kick after banDaniel Gultsch2015-01-081-0/+1
| |
| * fixed german translationDaniel Gultsch2015-01-081-2/+2
| |
| * some clean ups for affiliation change context menuDaniel Gultsch2015-01-082-4/+8
| |
| * 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-071-0/+3
| | | | | | | | | | | | | | | | | | * 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 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...
| * | Merge pull request #845 from SamWhited/materialDaniel Gultsch2015-01-072-0/+15
| |\ \ | | | | | | | | Add materials theme for v21 devices
| | * | Add materials themeSam Whited2015-01-062-0/+15
| | | |
| * | | basic affiliation changes in mucDaniel Gultsch2015-01-072-1/+28
| | |/ | |/|
| * | 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
| | |
| * | Czech translation for - show affiliation instead of role in MucDetailsJaroslav Lichtblau2015-01-061-0/+5
| | |
| * | 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
| * | corrected German spellingsChristian Schneppe2015-01-051-16/+16
| | | | | | | | | and shorten some strings
| * | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵Daniel Gultsch2015-01-052-0/+12
| | | | | | | | | | | | display role
| * | Updated languages for higher auto accept file sizes and changed labeling to ↵Christian Schneppe2015-01-0514-416/+437
| | | | | | | | | | | | MiB and KiB
| * | added higher auto accept file sizesDaniel Gultsch2015-01-041-33/+37
| | | | | | | | | | | | also changed labeling to MiB and KiB
| * | Czech translation updateJaroslav Lichtblau2015-01-041-1/+39
| | |
| * | Merge pull request #829 from kriztan/patch-1Daniel Gultsch2015-01-041-1/+1
| |\ \ | | |/ | |/| corrected German 'private_message_to'
| | * corrected German 'private_message_to'kriztan2015-01-041-1/+1
| | |
| * | Update spanish translationssergio2015-01-041-1/+15
| |/
* | - Avoiding accessing shared preferences to know if emoticons should be ↵steckbrief2015-01-201-1/+11
| | | | | | | | | | | | parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
* | Setting added for parsing emoticons or notTristan Zur2015-01-113-0/+9
| |
* | Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-0327-397/+901
|\| | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
| * Added and modified German translationskriztan2015-01-031-5/+11
| |