Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | ||||||
| * | always allow access to contact details. provide add button in contact details | iNPUTmice | 2015-01-21 | 4 | -72/+82 | |
| | | ||||||
| * | Add block/unblock to contact details menu | Sam Whited | 2015-01-21 | 3 | -9/+15 | |
| | | | | | | | | See #889 | |||||
| * | fixed missing image preview | iNPUTmice | 2015-01-20 | 1 | -1/+1 | |
| | | ||||||
| * | fixed up button on v21 devices | iNPUTmice | 2015-01-20 | 1 | -2/+6 | |
| | | ||||||
| * | fixed bug when sharing files from google drive | iNPUTmice | 2015-01-18 | 1 | -7/+11 | |
| | | ||||||
| * | 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 | |
| | | ||||||
| * | Add download button on notification if applicable | Sam Whited | 2015-01-16 | 1 | -6/+14 | |
| | | ||||||
| * | sending read marker when resuming activity and conversation is open | iNPUTmice | 2015-01-15 | 1 | -1/+4 | |
| | | ||||||
| * | show toast when avatar has been published - fixed #874 | iNPUTmice | 2015-01-15 | 1 | -13/+13 | |
| | | ||||||
| * | Add option to swap enter/emoticon key | Sam Whited | 2015-01-14 | 3 | -26/+45 | |
| | | ||||||
| * | context menu for files and offered files. fixed #848 fixed #849 | Daniel Gultsch | 2015-01-12 | 1 | -13/+21 | |
| | | ||||||
| * | 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 | 3 | -145/+172 | |
| | | ||||||
| * | make room persistant when changing subject or other muc options | Daniel Gultsch | 2015-01-10 | 1 | -16/+10 | |
| | | ||||||
| * | don't crash when selecting a conversation by uuid did not work | Daniel Gultsch | 2015-01-10 | 1 | -16/+20 | |
| | | ||||||
| * | fixed regression in tablet ui | Daniel Gultsch | 2015-01-09 | 1 | -0/+2 | |
| | | ||||||
| * | Introduced expert options to control enter-is-send | Daniel Gultsch | 2015-01-09 | 3 | -5/+17 | |
| | | | | | | | | (default == off) | |||||
| * | ensure that everyone is member before making a room private | Daniel Gultsch | 2015-01-09 | 1 | -1/+8 | |
| | | ||||||
| * | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 1 | -7/+73 | |
| | | ||||||
| * | code cleanup | Daniel Gultsch | 2015-01-08 | 1 | -2/+0 | |
| | | ||||||
| * | kick after ban | Daniel Gultsch | 2015-01-08 | 1 | -1/+14 | |
| | | ||||||
| * | some clean ups for affiliation change context menu | Daniel Gultsch | 2015-01-08 | 1 | -2/+8 | |
| | | ||||||
| * | more muc options | Daniel Gultsch | 2015-01-07 | 2 | -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 muc | Daniel Gultsch | 2015-01-07 | 1 | -13/+63 | |
| | | ||||||
| * | reset next encryption when archiving conversations | Daniel Gultsch | 2015-01-07 | 1 | -1/+0 | |
| | | ||||||
| * | run invalidateOptionsMenu on uiThread | Daniel Gultsch | 2015-01-06 | 1 | -1/+1 | |
| | | ||||||
| * | fixed potential NPEs in ShareWithActivity | Daniel Gultsch | 2015-01-06 | 1 | -4/+5 | |
| | | ||||||
| * | added debug info + possible platform bug work arounds to message adapter | Daniel Gultsch | 2015-01-05 | 1 | -0/+10 | |
| | | ||||||
| * | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵ | Daniel Gultsch | 2015-01-05 | 1 | -45/+48 | |
| | | | | | | | | display role | |||||
| * | added higher auto accept file sizes | Daniel Gultsch | 2015-01-04 | 1 | -2/+2 | |
| | | | | | | | | also changed labeling to MiB and KiB |