Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed last message in overview also to EmojiconTextView for displaying ↵ | lookshe | 2015-04-12 | 1 | -3/+6 |
| | | | | smileys correctly | ||||
* | added settings for accepting and downloading files | lookshe | 2015-04-12 | 21 | -26/+57 |
| | | | | fix in Settings, initialize with same values like in preferences.xml | ||||
* | add missing resource files | lookshe | 2015-04-12 | 8 | -0/+0 |
| | |||||
* | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 3 | -7/+22 |
| | |||||
* | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵ | steckbrief | 2015-04-11 | 3 | -3/+13 |
|\ | | | | | | | trz/master | ||||
| * | differ between received and read message | lookshe | 2015-04-11 | 3 | -3/+13 |
| | | |||||
* | | Color choose dialog | steckbrief | 2015-04-11 | 20 | -4/+164 |
|/ | |||||
* | no trim of messages or password | lookshe | 2015-04-11 | 2 | -0/+4 |
| | | | | check password with only spaces separately | ||||
* | Configurable LED color (Attention: Expert setting because currently only ↵ | steckbrief | 2015-03-31 | 2 | -0/+7 |
| | | | | text input) | ||||
* | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 34 | -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 translations | iNPUTmice | 2015-03-22 | 5 | -0/+21 |
| | | |||||
| * | pulled more translations | iNPUTmice | 2015-03-19 | 1 | -0/+5 |
| | | |||||
| * | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 2 | -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 transifex | iNPUTmice | 2015-03-16 | 10 | -11/+348 |
| | | |||||
| * | open location directly from notification | iNPUTmice | 2015-03-10 | 5 | -0/+0 |
| | | |||||
| * | show geo uris as 'location' in overview | iNPUTmice | 2015-03-10 | 1 | -0/+2 |
| | | |||||
| * | display geo uris as location. show 'send loction' in share menu if request ↵ | iNPUTmice | 2015-03-07 | 2 | -5/+15 |
| | | | | | | | | location intent can be resolved | ||||
| * | pulled new translations from transifex | iNPUTmice | 2015-02-27 | 5 | -23/+191 |
| | | |||||
| * | pulled new translations from transifex | iNPUTmice | 2015-02-23 | 6 | -35/+84 |
| | | |||||
| * | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 2 | -0/+11 |
| | | |||||
| * | pulled translations from transifex | iNPUTmice | 2015-02-16 | 10 | -28/+647 |
| | | |||||
| * | added actions to error notification | iNPUTmice | 2015-02-10 | 11 | -0/+1 |
| | | |||||
* | | Merge master-origin | steckbrief | 2015-02-20 | 191 | -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 resource | Sam Whited | 2015-02-01 | 5 | -0/+0 |
| | | |||||
| * | Merge pull request #955 from SamWhited/unused_resources | Daniel Gultsch | 2015-02-01 | 24 | -0/+0 |
| |\ | | | | | | | Remove unused resources | ||||
| | * | Remove unused resources | Sam Whited | 2015-02-01 | 24 | -0/+0 |
| | | | |||||
| * | | pulled spanish translations again | iNPUTmice | 2015-02-01 | 1 | -2/+2 |
| |/ | |||||
| * | pulled translations from transifex | iNPUTmice | 2015-02-01 | 16 | -0/+1513 |
| | | |||||
| * | Removes some unused strings (the legacy SSL stuff) | Sam Whited | 2015-02-01 | 4 | -7/+0 |
| | | |||||
| * | Remove title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 13 | -13/+0 |
| | | |||||
| * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 142 | -17/+80 |
| | | |||||
| * | updated translations | iNPUTmice | 2015-01-25 | 4 | -432/+476 |
| | | |||||
| * | Czech translation | Jaroslav Lichtblau | 2015-01-25 | 1 | -0/+1 |
| | | | | | | | | for "hide offline" added | ||||
| * | show checkbox to hide offline contacts | iNPUTmice | 2015-01-21 | 2 | -0/+9 |
| | | |||||
| * | always allow access to contact details. provide add button in contact details | iNPUTmice | 2015-01-21 | 2 | -12/+7 |
| | | |||||
| * | Add block/unblock to contact details menu | Sam Whited | 2015-01-21 | 1 | -0/+13 |
| | | | | | | | | See #889 | ||||
| * | Fixed action bar search for Android 5.0 | iNPUTmice | 2015-01-20 | 1 | -4/+4 |
| | | |||||
| * | Czech translation updated | Jaroslav Lichtblau | 2015-01-19 | 1 | -406/+420 |
| | | | | | | | | for Conversations | ||||
| * | Remove legacy SSL support | Sam Whited | 2015-01-19 | 10 | -15/+0 |
| | | |||||
| * | fetched translations from transifex | iNPUTmice | 2015-01-19 | 14 | -4159/+4412 |
| | | |||||
| * | proper desc for offering and sending images in conversations overview | iNPUTmice | 2015-01-18 | 1 | -0/+2 |
| | | |||||
| * | explain read marker | iNPUTmice | 2015-01-18 | 1 | -0/+13 |
| | | |||||
| * | use same helper methods for images and files | iNPUTmice | 2015-01-18 | 1 | -7/+3 |
| | | |||||
| * | Merge pull request #901 from kriztan/patch-2 | Daniel Gultsch | 2015-01-18 | 1 | -0/+2 |
| |\ | | | | | | | Added new file type names for file transfers | ||||
| | * | Added new file type names for file transfers | Christian S | 2015-01-18 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | - apk - vcard | ||||
| * | | Fix string substitutions with unknown filetypes | Sam Whited | 2015-01-17 | 1 | -0/+1 |
| |/ | |||||
| * | Correct the download file string on notifications | Sam Whited | 2015-01-17 | 6 | -9/+4 |
| | | | | | | | | Fixes #896 | ||||
| * | Add download button on notification if applicable | Sam Whited | 2015-01-16 | 5 | -0/+1 |
| | | |||||
| * | show toast when avatar has been published - fixed #874 | iNPUTmice | 2015-01-15 | 1 | -0/+1 |
| | | |||||
| * | added dedicated button to disable foreground service in perma notification | iNPUTmice | 2015-01-15 | 5 | -1/+2 |
| | |