aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | * Show errors before mute snackbarSam Whited2015-01-271-10/+10
| | | | | | | | | | | | See #939
| * | properly clear notifications. fixed #921iNPUTmice2015-01-291-2/+8
| |/
| * adapt caps on whether or not message confirmation is oniNPUTmice2015-01-262-3/+9
| |
| * Merge pull request #930 from betheg/otrDaniel Gultsch2015-01-251-0/+1
| |\ | | | | | | otr: switch to the otr-state the partner alternate.
| | * otr: switch to the otr-state the partner alternate.Michael2015-01-251-0/+1
| | | | | | | | | | | | should also fixed #877
| * | fix mergable() for /me command.Michael2015-01-251-1/+2
| |/
| * Changed online color to green instead of primaryAnders Sandblad2015-01-232-1/+5
| |
| * show checkbox to hide offline contactsiNPUTmice2015-01-211-6/+19
| |
| * deal with user entering full jids in join conference dialogiNPUTmice2015-01-211-2/+1
| |
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-214-72/+82
| |
| * Add block/unblock to contact details menuSam Whited2015-01-213-9/+15
| | | | | | | | See #889
| * fixed missing image previewiNPUTmice2015-01-201-1/+1
| |
| * fixed up button on v21 devicesiNPUTmice2015-01-201-2/+6
| |
| * fixed bug when sharing files from google driveiNPUTmice2015-01-181-7/+11
| |
| * explain read markeriNPUTmice2015-01-181-20/+6
| |
| * use same helper methods for images and filesiNPUTmice2015-01-181-33/+8
| |
| * Add download button on notification if applicableSam Whited2015-01-161-6/+14
| |
| * sending read marker when resuming activity and conversation is openiNPUTmice2015-01-151-1/+4
| |
| * show toast when avatar has been published - fixed #874iNPUTmice2015-01-151-13/+13
| |
| * Add option to swap enter/emoticon keySam Whited2015-01-143-26/+45
| |
| * context menu for files and offered files. fixed #848 fixed #849Daniel Gultsch2015-01-121-13/+21
| |
| * reworked message preview / message meta information (ie file offered, ↵Daniel Gultsch2015-01-122-129/+46
| | | | | | | | | | | | received * file) fixed #837
| * Add XEP-0245 (/me command) supportSam Whited2015-01-113-145/+172
| |
| * make room persistant when changing subject or other muc optionsDaniel Gultsch2015-01-101-16/+10
| |
| * don't crash when selecting a conversation by uuid did not workDaniel Gultsch2015-01-101-16/+20
| |
| * fixed regression in tablet uiDaniel Gultsch2015-01-091-0/+2
| |
| * Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-093-5/+17
| | | | | | | | (default == off)
| * ensure that everyone is member before making a room privateDaniel Gultsch2015-01-091-1/+8
| |
| * allow for very basic muc configurationDaniel Gultsch2015-01-081-7/+73
| |
| * code cleanupDaniel Gultsch2015-01-081-2/+0
| |
| * kick after banDaniel Gultsch2015-01-081-1/+14
| |
| * some clean ups for affiliation change context menuDaniel Gultsch2015-01-081-2/+8
| |
| * more muc optionsDaniel Gultsch2015-01-072-10/+28
| | | | | | | | | | | | * 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
| * basic affiliation changes in mucDaniel Gultsch2015-01-071-13/+63
| |
| * reset next encryption when archiving conversationsDaniel Gultsch2015-01-071-1/+0
| |
| * run invalidateOptionsMenu on uiThreadDaniel Gultsch2015-01-061-1/+1
| |
| * fixed potential NPEs in ShareWithActivityDaniel Gultsch2015-01-061-4/+5
| |
| * added debug info + possible platform bug work arounds to message adapterDaniel Gultsch2015-01-051-0/+10
| |
| * Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵Daniel Gultsch2015-01-051-45/+48
| | | | | | | | display role
| * added higher auto accept file sizesDaniel Gultsch2015-01-041-2/+2
| | | | | | | | also changed labeling to MiB and KiB