Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed received and read confirmation setting to one list and put it to ↵ | lookshe | 2015-04-14 | 2 | -3/+16 |
| | | | | settings class | ||||
* | added settings for accepting and downloading files | lookshe | 2015-04-12 | 1 | -1/+7 |
| | | | | fix in Settings, initialize with same values like in preferences.xml | ||||
* | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into ↵ | steckbrief | 2015-04-11 | 1 | -1/+3 |
|\ | | | | | | | trz/master | ||||
| * | differ between received and read message | lookshe | 2015-04-11 | 1 | -1/+3 |
| | | |||||
* | | Color choose dialog | steckbrief | 2015-04-11 | 2 | -1/+8 |
|/ | |||||
* | no trim of messages or password | lookshe | 2015-04-11 | 1 | -0/+3 |
| | | | | check password with only spaces separately | ||||
* | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 1 | -0/+14 |
|\ | | | | | | | | | | | | | | | | | 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 | ||||
| * | Added multiple select to Choose Contact Activity | Andreas Straub | 2015-03-18 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | 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 | 1 | -0/+3 |
| | | | | | | | | location intent can be resolved | ||||
| * | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 1 | -0/+4 |
| | | |||||
| * | added actions to error notification | iNPUTmice | 2015-02-10 | 1 | -0/+1 |
| | | |||||
* | | Merge master-origin | steckbrief | 2015-02-20 | 6 | -50/+136 |
|\| | | | | | | | | | | | | | | | | | | | 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 title_activity_conversations and use app_name instead | kruks23 | 2015-01-30 | 1 | -1/+0 |
| | | |||||
| * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 3 | -0/+42 |
| | | |||||
| * | show checkbox to hide offline contacts | iNPUTmice | 2015-01-21 | 1 | -0/+1 |
| | | |||||
| * | Remove legacy SSL support | Sam Whited | 2015-01-19 | 1 | -2/+0 |
| | | |||||
| * | proper desc for offering and sending images in conversations overview | iNPUTmice | 2015-01-18 | 1 | -0/+2 |
| | | |||||
| * | 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 | 1 | -4/+4 |
| | | | | | | | | Fixes #896 | ||||
| * | Add download button on notification if applicable | Sam Whited | 2015-01-16 | 1 | -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 | 1 | -1/+2 |
| | | |||||
| * | Merge pull request #885 from SamWhited/display-enter-key | Daniel Gultsch | 2015-01-14 | 1 | -0/+2 |
| |\ | | | | | | | Add option to swap enter/emoticon key | ||||
| | * | Add option to swap enter/emoticon key | Sam Whited | 2015-01-14 | 1 | -0/+2 |
| | | | |||||
| * | | Harden the TLS connection cipher suites | Sam Whited | 2015-01-14 | 1 | -1/+1 |
| |/ | |||||
| * | make use of different dimensions for different screen sizes | Daniel Gultsch | 2015-01-13 | 1 | -2/+4 |
| | | |||||
| * | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 1 | -2/+1 |
| | | |||||
| * | 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 | 1 | -2/+2 |
| | | |||||
| * | Introduced expert options to control enter-is-send | Daniel Gultsch | 2015-01-09 | 1 | -0/+3 |
| | | | | | | | | (default == off) | ||||
| * | make project translatable via transifex | Daniel Gultsch | 2015-01-09 | 2 | -6/+12 |
| | | |||||
| * | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 1 | -2/+9 |
| | | |||||
| * | kick after ban | Daniel Gultsch | 2015-01-08 | 1 | -0/+1 |
| | | |||||
| * | some clean ups for affiliation change context menu | Daniel Gultsch | 2015-01-08 | 1 | -4/+4 |
| | | |||||
| * | more muc options | Daniel Gultsch | 2015-01-07 | 1 | -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 #845 from SamWhited/material | Daniel Gultsch | 2015-01-07 | 1 | -0/+1 |
| |\ | | | | | | | Add materials theme for v21 devices | ||||
| | * | Add materials theme | Sam Whited | 2015-01-06 | 1 | -0/+1 |
| | | | |||||
| * | | basic affiliation changes in muc | Daniel Gultsch | 2015-01-07 | 1 | -0/+6 |
| |/ | |||||
| * | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵ | Daniel Gultsch | 2015-01-05 | 1 | -0/+5 |
| | | | | | | | | display role | ||||
| * | added higher auto accept file sizes | Daniel Gultsch | 2015-01-04 | 1 | -33/+37 |
| | | | | | | | | also changed labeling to MiB and KiB | ||||
* | | Setting added for parsing emoticons or not | Tristan Zur | 2015-01-11 | 1 | -0/+2 |
|/ | |||||
* | record voice and attachment refactor | Daniel Gultsch | 2015-01-03 | 1 | -0/+1 |
| | |||||
* | disable / enable all accounts | Daniel Gultsch | 2015-01-03 | 1 | -0/+2 |
| | |||||
* | migrated change password into separate activity | Daniel Gultsch | 2015-01-03 | 1 | -0/+4 |
| | |||||
* | some further otr improvements | Daniel Gultsch | 2015-01-02 | 1 | -1/+1 |
| | |||||
* | improved OTR verification part one | Daniel Gultsch | 2015-01-02 | 1 | -0/+7 |
| |