Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag '1.5.2' into trz/rebase | lookshe | 2015-08-11 | 15 | -566/+1038 |
| | |||||
* | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference | steckbrief | 2015-06-19 | 1 | -2/+4 |
| | |||||
* | Status color added to "create conversation" (refers to ticket #22 in flyspray) | steckbrief | 2015-06-19 | 1 | -0/+4 |
| | |||||
* | changed received and read confirmation setting to one list and put it to ↵ | lookshe | 2015-04-14 | 1 | -2/+3 |
| | | | | settings class | ||||
* | 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 | 3 | -19/+143 |
| | |||||
* | whatsapp-like smiley implemantation | lookshe | 2015-04-12 | 1 | -1/+2 |
| | |||||
* | show online status under avatar in same way for muc as the send button does | lookshe | 2015-04-11 | 1 | -13/+18 |
| | |||||
* | differ between received and read message | lookshe | 2015-04-11 | 2 | -5/+2 |
| | |||||
* | no trim of messages or password | lookshe | 2015-04-11 | 2 | -4/+7 |
| | | | | check password with only spaces separately | ||||
* | Changes for emoticon parser reactivated | steckbrief | 2015-03-31 | 2 | -6/+8 |
| | |||||
* | Merge tag '1.2.0' into trz/master | steckbrief | 2015-03-30 | 17 | -327/+845 |
|\ | | | | | | | | | | | | | | | | | 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 | 2 | -6/+121 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | add context menu entries for geo uris | iNPUTmice | 2015-03-11 | 1 | -17/+33 |
| | | |||||
| * | display geo uris as location. show 'send loction' in share menu if request ↵ | iNPUTmice | 2015-03-07 | 2 | -48/+122 |
| | | | | | | | | location intent can be resolved | ||||
| * | fixed enter is send option | iNPUTmice | 2015-03-06 | 2 | -6/+10 |
| | | |||||
| * | avoid unnecessary thread creation | iNPUTmice | 2015-03-05 | 1 | -1/+1 |
| | | |||||
| * | hide change password menu item if server feature is unavailable | iNPUTmice | 2015-02-27 | 1 | -7/+8 |
| | | |||||
| * | reset error status in edit account when reconnecting | iNPUTmice | 2015-02-26 | 1 | -0/+4 |
| | | |||||
| * | prevent next button from showing up too early on account setup | iNPUTmice | 2015-02-25 | 1 | -1/+1 |
| | | |||||
| * | init mode (first start) for StartConversationActivity (no up button) and ↵ | iNPUTmice | 2015-02-22 | 4 | -14/+44 |
| | | | | | | | | avoid being started multiple times. fixed #995 | ||||
| * | properly remove invalid avatar | iNPUTmice | 2015-02-22 | 2 | -0/+2 |
| | | |||||
| * | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 3 | -37/+117 |
| | | |||||
| * | fixed #993 | iNPUTmice | 2015-02-19 | 1 | -1/+2 |
| | | |||||
| * | launch edit account activity when starting Conversations for the first time ↵ | iNPUTmice | 2015-02-19 | 1 | -5/+9 |
| | | | | | | | | (fixed regression) | ||||
| * | always call to cancel before loading new avatars | iNPUTmice | 2015-02-18 | 2 | -24/+28 |
| | | |||||
| * | avoid weird npe. fixed #991 | iNPUTmice | 2015-02-18 | 1 | -1/+3 |
| | | |||||
| * | limit ui refresh rate | iNPUTmice | 2015-02-17 | 7 | -92/+79 |
| | | |||||
| * | refresh list view more often | iNPUTmice | 2015-02-17 | 2 | -2/+2 |
| | | |||||
| * | support for XEP-0092: Software Version | iNPUTmice | 2015-02-16 | 1 | -11/+3 |
| | | |||||
| * | 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 |
| | | |||||
| * | use time instead of uptime for unmute | iNPUTmice | 2015-02-12 | 1 | -3/+1 |
| | | |||||
| * | don't show 'enter pgp key' in non encrypted chats | iNPUTmice | 2015-02-09 | 1 | -0/+1 |
| | | |||||
| * | sort users in muc | Daniel Gultsch | 2015-02-07 | 1 | -3/+12 |
| | | |||||
| * | refactored how snackbar is displayed | Daniel Gultsch | 2015-02-07 | 1 | -82/+105 |
| | | |||||
* | | Merge master-origin | steckbrief | 2015-02-20 | 13 | -547/+741 |
|\| | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2015-01-29 | 1 | -2/+7 |
| |\ | | | | | | | | | | development | ||||
| | * | Use Material Design Icons on API 21+ | Sam Whited | 2015-01-29 | 1 | -2/+7 |
| | | | |||||
| * | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2015-01-29 | 1 | -10/+10 |
| |\| | | | | | | | | | | development | ||||
| | * | Show errors before mute snackbar | Sam Whited | 2015-01-27 | 1 | -10/+10 |
| | | | | | | | | | | | | See #939 | ||||
| * | | properly clear notifications. fixed #921 | iNPUTmice | 2015-01-29 | 1 | -2/+8 |
| |/ | |||||
| * | adapt caps on whether or not message confirmation is on | iNPUTmice | 2015-01-26 | 2 | -3/+9 |
| | | |||||
| * | Merge pull request #930 from betheg/otr | Daniel Gultsch | 2015-01-25 | 1 | -0/+1 |
| |\ | | | | | | | otr: switch to the otr-state the partner alternate. | ||||
| | * | otr: switch to the otr-state the partner alternate. | Michael | 2015-01-25 | 1 | -0/+1 |
| | | | | | | | | | | | | should also fixed #877 | ||||
| * | | 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 | 2 | -1/+5 |
| | | |||||
| * | show checkbox to hide offline contacts | iNPUTmice | 2015-01-21 | 1 | -6/+19 |
| | | |||||
| * | deal with user entering full jids in join conference dialog | iNPUTmice | 2015-01-21 | 1 | -2/+1 |
| | |