Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Merge pull request #885 from SamWhited/display-enter-key | Daniel Gultsch | 2015-01-14 | 2 | -0/+7 |
| |\ | | | | | | | Add option to swap enter/emoticon key | ||||
| | * | Add option to swap enter/emoticon key | Sam Whited | 2015-01-14 | 2 | -0/+7 |
| | | | |||||
| * | | Harden the TLS connection cipher suites | Sam Whited | 2015-01-14 | 1 | -1/+1 |
| |/ | |||||
| * | Fix bottom padding on about page | Sam Whited | 2015-01-13 | 1 | -1/+1 |
| | | |||||
| * | make use of different dimensions for different screen sizes | Daniel Gultsch | 2015-01-13 | 15 | -114/+56 |
| | | |||||
| * | Merge pull request #872 from Elinvention/development | Daniel Gultsch | 2015-01-13 | 1 | -25/+104 |
| |\ | | | | | | | Updated Italian translations | ||||
| | * | Updated Italian translations | Elia | 2015-01-13 | 1 | -25/+104 |
| | | | |||||
| * | | Merge pull request #873 from SamWhited/about-margin-fix | Daniel Gultsch | 2015-01-13 | 1 | -4/+4 |
| |\ \ | | |/ | |/| | Use margin instead of padding on about screen | ||||
| | * | Use margin instead of padding in about screen | Sam Whited | 2015-01-12 | 1 | -4/+4 |
| | | | |||||
| * | | Czech translation | Jaroslav Lichtblau | 2015-01-12 | 1 | -9/+37 |
| |/ | | | | | | | updated | ||||
| * | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 2 | -4/+3 |
| | | |||||
| * | reworked message preview / message meta information (ie file offered, ↵ | Daniel Gultsch | 2015-01-12 | 1 | -5/+8 |
| | | | | | | | | | | | | received * file) fixed #837 | ||||
| * | shortened some string | Daniel Gultsch | 2015-01-11 | 2 | -2/+3 |
| | | |||||
| * | fixed #860 | Daniel Gultsch | 2015-01-10 | 1 | -0/+1 |
| | | |||||
| * | Introduced expert options to control enter-is-send | Daniel Gultsch | 2015-01-09 | 2 | -0/+10 |
| | | | | | | | | (default == off) | ||||
| * | make project translatable via transifex | Daniel Gultsch | 2015-01-09 | 16 | -475/+12 |
| | | |||||
| * | added missing drawables | Daniel Gultsch | 2015-01-08 | 4 | -0/+0 |
| | | |||||
| * | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 3 | -118/+160 |
| | | |||||
| * | kick after ban | Daniel Gultsch | 2015-01-08 | 1 | -0/+1 |
| | | |||||
| * | fixed german translation | Daniel Gultsch | 2015-01-08 | 1 | -2/+2 |
| | | |||||
| * | some clean ups for affiliation change context menu | Daniel Gultsch | 2015-01-08 | 2 | -4/+8 |
| | | |||||
| * | Merge pull request #851 from kriztan/patch-2 | Daniel Gultsch | 2015-01-07 | 1 | -9/+12 |
| |\ | | | | | | | Updated German translations for more muc options |