aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Configurable LED color (Attention: Expert setting because currently only ↵steckbrief2015-03-312-0/+7
| | | | text input)
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3034-93/+1328
|\ | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * pulled translationsiNPUTmice2015-03-225-0/+21
| |
| * pulled more translationsiNPUTmice2015-03-191-0/+5
| |
| * Added multiple select to Choose Contact ActivityAndreas Straub2015-03-182-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing the Choose Contact Activity a boolean called "multiple" set to true, it now allows the user to select multiple contacts. Long pressing a contact enters multiple selection mode and the selection is confirmed using a button in the CAB. The Activity returns whether or not multiple contacts were selected using the same boolean. If multiple contacts were selected, an array of JID strings called "contacts" is returned. The Choose Contact Activity now also honors "filter_contacts", an array of strings containing JIDs that should not be displayed in the picker. The invite to conference dialog now uses this feature to enable inviting multiple contacts at once. Additionally, Invite Contact uses "filter_contacts" to only display contacts that are not yet participating in the conversation
| * pulled new translations from transifexiNPUTmice2015-03-1610-11/+348
| |
| * open location directly from notificationiNPUTmice2015-03-105-0/+0
| |
| * show geo uris as 'location' in overviewiNPUTmice2015-03-101-0/+2
| |
| * display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice2015-03-072-5/+15
| | | | | | | | location intent can be resolved
| * pulled new translations from transifexiNPUTmice2015-02-275-23/+191
| |
| * pulled new translations from transifexiNPUTmice2015-02-236-35/+84
| |
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-212-0/+11
| |
| * pulled translations from transifexiNPUTmice2015-02-1610-28/+647
| |
| * added actions to error notificationiNPUTmice2015-02-1011-0/+1
| |
* | 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