Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 5 | -1147/+0 |
| | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | ||||
* | changed last message in overview also to EmojiconTextView for displaying ↵ | lookshe | 2015-04-12 | 1 | -1/+3 |
| | | | | smileys correctly | ||||
* | whatsapp-like smiley implementation | lookshe | 2015-04-12 | 1 | -3/+4 |
| | |||||
* | show online status under avatar in same way for muc as the send button does | lookshe | 2015-04-11 | 1 | -13/+18 |
| | |||||
* | Changes for emoticon parser reactivated | steckbrief | 2015-03-31 | 2 | -6/+8 |
| | |||||
* | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 3 | -11/+216 |
|\ | | | | | | | | | | | | | | | | | 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 | ||||
| * | display geo uris as location. show 'send loction' in share menu if request ↵ | iNPUTmice | 2015-03-07 | 1 | -1/+31 |
| | | | | | | | | location intent can be resolved | ||||
| * | properly remove invalid avatar | iNPUTmice | 2015-02-22 | 2 | -0/+2 |
| | | |||||
| * | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 1 | -3/+1 |
| | | |||||
| * | always call to cancel before loading new avatars | iNPUTmice | 2015-02-18 | 2 | -24/+28 |
| | | |||||
| * | fixed avatar cache lookup in ListItemAdapter | iNPUTmice | 2015-02-16 | 1 | -4/+1 |
| | | |||||
| * | made image view background more colorful while waiting on actual avatar to load | iNPUTmice | 2015-02-15 | 2 | -2/+3 |
| | | |||||
| * | loading avatars in seperate tasks | iNPUTmice | 2015-02-15 | 2 | -4/+177 |
| | | |||||
* | | Merge master-origin | steckbrief | 2015-02-20 | 3 | -274/+196 |
|\| | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | fix mergable() for /me command. | Michael | 2015-01-25 | 1 | -1/+2 |
| | | |||||
| * | Changed online color to green instead of primary | Anders Sandblad | 2015-01-23 | 1 | -1/+1 |
| | | |||||
| * | fixed missing image preview | iNPUTmice | 2015-01-20 | 1 | -1/+1 |
| | | |||||
| * | explain read marker | iNPUTmice | 2015-01-18 | 1 | -20/+6 |
| | | |||||
| * | use same helper methods for images and files | iNPUTmice | 2015-01-18 | 1 | -33/+8 |
| | | |||||
| * | reworked message preview / message meta information (ie file offered, ↵ | Daniel Gultsch | 2015-01-12 | 2 | -129/+46 |
| | | | | | | | | | | | | received * file) fixed #837 | ||||
| * | Add XEP-0245 (/me command) support | Sam Whited | 2015-01-11 | 2 | -140/+167 |
| | | |||||
| * | added debug info + possible platform bug work arounds to message adapter | Daniel Gultsch | 2015-01-05 | 1 | -0/+10 |
| | | |||||
| * | added higher auto accept file sizes | Daniel Gultsch | 2015-01-04 | 1 | -2/+2 |
| | | | | | | | | also changed labeling to MiB and KiB | ||||
* | | - Avoiding accessing shared preferences to know if emoticons should be ↵ | steckbrief | 2015-01-20 | 2 | -6/+28 |
| | | | | | | | | | | | | parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status") | ||||
* | | Setting added for parsing emoticons or not | Tristan Zur | 2015-01-11 | 2 | -2/+8 |
| | | |||||
* | | Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter ↵ | Tristan Zur | 2015-01-10 | 2 | -2/+4 |
| | | | | | | | | for method eu.siacs.conversations.utils.UIHelper.transformAscii.. | ||||
* | | Merge branch 'master' of ssh://git.fucktheforce.de/conversations | lookshe | 2015-01-03 | 3 | -41/+61 |
|\| | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/Config.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 | ||||
| * | click on dynamic tag to filter for that tag | Daniel Gultsch | 2015-01-02 | 1 | -0/+22 |
| | | |||||
| * | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 1 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | avoid npe on weird platform bugs | iNPUTmice | 2014-12-15 | 1 | -30/+30 |
| | | |||||
| * | cleanup: removed unused emoticon parsing | iNPUTmice | 2014-12-09 | 2 | -10/+2 |
| | | |||||
* | | remaining part of my patch | lookshe | 2015-01-03 | 2 | -6/+4 |
|/ | |||||
* | possible work around for some weird - possibly sdk - bugs | iNPUTmice | 2014-12-07 | 1 | -4/+5 |
| | |||||
* | further npe checks | iNPUTmice | 2014-12-03 | 1 | -5/+11 |
| | |||||
* | refactored the message adapter a bit | iNPUTmice | 2014-12-03 | 1 | -32/+33 |
| | |||||
* | fixed #728 | iNPUTmice | 2014-12-01 | 1 | -5/+2 |
| | |||||
* | remove unused imports. | Michael | 2014-11-21 | 1 | -5/+0 |
| | |||||
* | happy hanukkah | iNPUTmice | 2014-11-16 | 1 | -0/+21 |
| | |||||
* | Add incompatible server status | Sam Whited | 2014-11-15 | 1 | -65/+13 |
| | |||||
* | Add security error status | Sam Whited | 2014-11-15 | 1 | -0/+4 |
| | |||||
* | Make account status an enum | Sam Whited | 2014-11-15 | 1 | -11/+11 |
| | |||||
* | handled more error cases | iNPUTmice | 2014-11-15 | 1 | -5/+20 |
| | |||||
* | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 2 | -2/+16 |
| | |||||
* | adepted conversationadapter to deal with files | iNPUTmice | 2014-11-15 | 1 | -3/+21 |
| | |||||
* | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-15 | 1 | -34/+27 |
| | |||||
* | progress for http images as well. fixed open button for sent files | iNPUTmice | 2014-11-15 | 1 | -2/+7 |
| | |||||
* | bug fixes and various improvements for file transfer | iNPUTmice | 2014-11-15 | 1 | -4/+9 |
| | |||||
* | basic arbitrary file transfer | iNPUTmice | 2014-11-15 | 1 | -32/+65 |
| | |||||
* | use isBareJid instead of getResourcePart().isEmpty() | iNPUTmice | 2014-11-09 | 1 | -1/+1 |
| | |||||
* | fixed muc sender history for some cases (where the previous nick was a valid ↵ | iNPUTmice | 2014-11-09 | 1 | -4/+12 |
| | | | | jid) |