Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Make `app_name' string untranslatable | Sam Whited | 2014-12-29 | 1 | -2/+2 |
| | | | | | | Remove untranslatable about message Escape single quote in NL translation | ||||
* | code cleanup for change password stuff | Daniel Gultsch | 2014-12-25 | 1 | -1/+1 |
| | |||||
* | added callback to change account password to notify UI on success / failure | Daniel Gultsch | 2014-12-25 | 1 | -0/+3 |
| | |||||
* | Add ability to change password on server | Sam Whited | 2014-12-25 | 1 | -1/+2 |
| | | | | Fixes #260 | ||||
* | Add more server compatibility info. | Sam Whited | 2014-12-23 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide server info behind a checkbox. Add XEP-0352 support to the server info list Add XEP-0237 to server info list Add XEP-0352 support to the server info list Add MaM and Blocking to the account XEPs list Also add a toggle button to hide some of the list Rebase on current codebase Make MAM string more descriptive Change show more button to checkbox menu item Shorten `MAM (History)' to `MAM' Order XEP list and hide all by default Supress warning (which is wrong anyways) Change `Show more' to `Show more info' | ||||
* | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 | ||||
* | made scroling smoother + bug fixes for history loading | iNPUTmice | 2014-12-17 | 1 | -0/+1 |
| | |||||
* | smoothed out scrolling a bit | iNPUTmice | 2014-12-17 | 1 | -0/+1 |
| | |||||
* | Add quiet hours feature | Sam Whited | 2014-12-14 | 1 | -0/+6 |
| | |||||
* | Accessibility: Add missing image descriptions | Sam Whited | 2014-11-29 | 1 | -0/+2 |
| | |||||
* | verify contacts key only on initiating side of smp | iNPUTmice | 2014-11-21 | 1 | -0/+2 |
| | |||||
* | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 1 | -0/+4 |
| |