aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge master-originsteckbrief2015-02-20191-4295/+6099
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.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 src/main/res/values-de/strings.xml
| * Remove another unused resourceSam Whited2015-02-015-0/+0
| |
| * Merge pull request #955 from SamWhited/unused_resourcesDaniel Gultsch2015-02-0124-0/+0
| |\ | | | | | | Remove unused resources
| | * Remove unused resourcesSam Whited2015-02-0124-0/+0
| | |
| * | pulled spanish translations againiNPUTmice2015-02-011-2/+2
| |/
| * pulled translations from transifexiNPUTmice2015-02-0116-0/+1513
| |
| * Removes some unused strings (the legacy SSL stuff)Sam Whited2015-02-014-7/+0
| |
| * Remove title_activity_conversations and use app_name insteadkruks232015-01-3013-13/+0
| |
| * Use Material Design Icons on API 21+Sam Whited2015-01-29142-17/+80
| |
| * updated translationsiNPUTmice2015-01-254-432/+476
| |
| * Czech translationJaroslav Lichtblau2015-01-251-0/+1
| | | | | | | | for "hide offline" added
| * show checkbox to hide offline contactsiNPUTmice2015-01-212-0/+9
| |
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-212-12/+7
| |
| * Add block/unblock to contact details menuSam Whited2015-01-211-0/+13
| | | | | | | | See #889
| * Fixed action bar search for Android 5.0iNPUTmice2015-01-201-4/+4
| |
| * Czech translation updatedJaroslav Lichtblau2015-01-191-406/+420
| | | | | | | | for Conversations
| * Remove legacy SSL supportSam Whited2015-01-1910-15/+0
| |
| * fetched translations from transifexiNPUTmice2015-01-1914-4159/+4412
| |
| * proper desc for offering and sending images in conversations overviewiNPUTmice2015-01-181-0/+2
| |
| * explain read markeriNPUTmice2015-01-181-0/+13
| |
| * use same helper methods for images and filesiNPUTmice2015-01-181-7/+3
| |
| * Merge pull request #901 from kriztan/patch-2Daniel Gultsch2015-01-181-0/+2
| |\ | | | | | | Added new file type names for file transfers
| | * Added new file type names for file transfersChristian S2015-01-181-0/+2
| | | | | | | | | | | | | | | - apk - vcard
| * | Fix string substitutions with unknown filetypesSam Whited2015-01-171-0/+1
| |/
| * Correct the download file string on notificationsSam Whited2015-01-176-9/+4
| | | | | | | | Fixes #896
| * Add download button on notification if applicableSam Whited2015-01-165-0/+1
| |
| * show toast when avatar has been published - fixed #874iNPUTmice2015-01-151-0/+1
| |
| * added dedicated button to disable foreground service in perma notificationiNPUTmice2015-01-155-1/+2
| |
| * 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