aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui (follow)
Commit message (Collapse)AuthorAgeFilesLines
* fixed merge errorslookshe2016-03-201-1/+1
|
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-6/+3
|\
| * Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-122-7/+4
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-121-3/+3
| |\ | |/ |/|
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+1
|\| | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-114-17/+8
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-4/+7
|\| | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
| * Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-101-2/+1
| |
| * Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-102-4/+6
| |
| * reset link and highlight colors to system defaultsteckbrief2016-03-081-17/+20
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0813-204/+400
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0637-1201/+3965
| |\ | |/ |/|
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-151-1/+1
| | | | | | | | - publishAvatar moved from XmppConnectionService to AvatarService
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-2/+12
| |
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-139-23/+24
| | | | | | | | | | | | | | - fetchAvatar, fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from XmppConnectionService to AvatarService - Several unused imports removed - XmppSendUtil introduced to enable presencePacket and iqPacket sending without using XmppConnectionService since the account has everything needed - UiUpdateHelper introduced to enable UI updates without using XmppConnectionService directly
| * Fixes FS#107, Implements FS#77steckbrief2016-01-081-1/+11
| | | | | | | | Show the number of online resources in account view and enable show resources by clicking on the account jid
* | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-3/+3
| |
* | Imports organizedsteckbrief2016-02-125-6/+2
| |
* | Compilation errors and merge mixups fixedsteckbrief2016-02-111-6/+7
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-171-1/+1
|\|
| * Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-171-1/+1
| | | | | | | | nothing is copied
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-3/+93
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-161-2/+90
| | | | | | | | distinguishes between image resizing and compressing/saving
| * Fixes FS#95: NPE when opening message details for failed file transfersteckbrief2015-12-161-1/+2
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-103-2/+32
|\|
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-107-19/+67
| |
| * Fix flagging no more messages on server for conversationsteckbrief2015-12-062-1/+14
| |
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-043-16/+44
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-7/+2
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-042-15/+8
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-022-2/+33
|\|
| * Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-206-13/+44
| | | | | | | | activity to show logcat output and button to copy contents
| * FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-065-19/+13
| | | | | | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-035-1/+229
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-0310-121/+351
| | | | | | | | picture or not
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+1
| |
| * Access to preferences moved to global utility class ↵steckbrief2015-10-219-143/+107
| | | | | | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
| * added comment for clarification, why the timestamp of the first msg of msg ↵steckbrief2015-10-171-1/+1
| | | | | | | | list is needed to query older msgs with mam
| * Removed unused importssteckbrief2015-10-151-4/+0
| |
| * Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-151-10/+32
| |
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ↵steckbrief2015-10-051-2/+2
| | | | | | | | access to app information
* | fixed importstrz/1.5.2.2lookshe2015-10-054-10/+10
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0530-9405/+0
|/ | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
* Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-18/+142
| | | | type and message status
* Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-047-3/+303
| | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-022-6/+9
|
* moved merged files to correct locationlookshe2015-08-163-0/+167
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-165-213/+120
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* resolve of some compiler errorslookshe2015-08-131-0/+1
|