aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2015-10-054-8/+20
|\ | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * moved merged files to correct locationlookshe2015-08-162-166/+0
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-162-0/+166
| |\ | |/ |/| | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1928-8861/+0
| | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-163-8/+8
| |
* | Fixes FS#15 - Adding smiley only possible at the endlookshe2015-08-161-21/+13
| | | | | | | | Removed unnecessary ClickedListeners
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-162-3/+1
| | | | | | | | Fixes FS#34 - review all calls for String.trim()
* | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-123-138/+219
| | | | | | | | | | - OnScrollListener for ListView of messages removed and replaced with swipe refresh - Loading of messages now possible even if no message is present in conversation
* | Fixes FS#20: Limitation of end conversation swipe to left sidesteckbrief2015-08-111-58/+59
| |
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-1115-566/+1038
| |
* | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+4
| |
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+4
|/
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-2/+3
| | | | settings class
* changed last message in overview also to EmojiconTextView for displaying ↵lookshe2015-04-121-1/+3
| | | | smileys correctly
* whatsapp-like smiley implementationlookshe2015-04-123-19/+143
|
* whatsapp-like smiley implemantationlookshe2015-04-121-1/+2
|
* show online status under avatar in same way for muc as the send button doeslookshe2015-04-111-13/+18
|
* differ between received and read messagelookshe2015-04-112-5/+2
|
* no trim of messages or passwordlookshe2015-04-112-4/+7
| | | | check password with only spaces separately
* Changes for emoticon parser reactivatedsteckbrief2015-03-312-6/+8
|
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3017-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 ActivityAndreas Straub2015-03-182-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 urisiNPUTmice2015-03-111-17/+33
| |
| * display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice2015-03-072-48/+122
| | | | | | | | location intent can be resolved
| * fixed enter is send optioniNPUTmice2015-03-062-6/+10
| |
| * avoid unnecessary thread creationiNPUTmice2015-03-051-1/+1
| |
| * hide change password menu item if server feature is unavailableiNPUTmice2015-02-271-7/+8
| |
| * reset error status in edit account when reconnectingiNPUTmice2015-02-261-0/+4
| |
| * prevent next button from showing up too early on account setupiNPUTmice2015-02-251-1/+1
| |
| * init mode (first start) for StartConversationActivity (no up button) and ↵iNPUTmice2015-02-224-14/+44
| | | | | | | | avoid being started multiple times. fixed #995
| * properly remove invalid avatariNPUTmice2015-02-222-0/+2
| |
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-213-37/+117
| |
| * fixed #993iNPUTmice2015-02-191-1/+2
| |
| * launch edit account activity when starting Conversations for the first time ↵iNPUTmice2015-02-191-5/+9
| | | | | | | | (fixed regression)
| * always call to cancel before loading new avatarsiNPUTmice2015-02-182-24/+28
| |
| * avoid weird npe. fixed #991iNPUTmice2015-02-181-1/+3
| |
| * limit ui refresh rateiNPUTmice2015-02-177-92/+79
| |
| * refresh list view more ofteniNPUTmice2015-02-172-2/+2
| |
| * support for XEP-0092: Software VersioniNPUTmice2015-02-161-11/+3
| |
| * fixed avatar cache lookup in ListItemAdapteriNPUTmice2015-02-161-4/+1
| |
| * made image view background more colorful while waiting on actual avatar to loadiNPUTmice2015-02-152-2/+3
| |
| * loading avatars in seperate tasksiNPUTmice2015-02-152-4/+177
| |
| * use time instead of uptime for unmuteiNPUTmice2015-02-121-3/+1
| |
| * don't show 'enter pgp key' in non encrypted chatsiNPUTmice2015-02-091-0/+1
| |
| * sort users in mucDaniel Gultsch2015-02-071-3/+12
| |
| * refactored how snackbar is displayedDaniel Gultsch2015-02-071-82/+105
| |
* | Merge master-originsteckbrief2015-02-2013-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 ↵iNPUTmice2015-01-291-2/+7
| |\ | | | | | | | | | development
| | * Use Material Design Icons on API 21+Sam Whited2015-01-291-2/+7
| | |
| * | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2015-01-291-10/+10
| |\| | | | | | | | | | development