aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus (follow)
Commit message (Collapse)AuthorAgeFilesLines
* fixed merge errorslookshe2016-03-201-1/+1
|
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-122-88/+3
|\
| * Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-127-55/+93
| |\ | |/ |/|
| * 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-112-2/+3
|\| | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| |
* | 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-103-37/+45
| |
| * 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-0831-477/+874
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-077-13/+49
| |\
| * \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06133-3509/+13072
| |\ \
| * | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-092-2/+2
| | | | | | | | | | | | | | | | should be shown for a message
| * | | implementation hint for FS#96 addedsteckbrief2016-02-091-0/+1
| | | |
| * | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-091-6/+7
| | | | | | | | | | | | | | | | should be shown for a message
| * | | Fixed minor class cast issuesteckbrief2016-01-161-4/+4
| | | |
* | | | use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
| |_|/ |/| |
* | | corrected getRealPathFromUrilookshe2016-03-071-2/+40
| | |
* | | Finally fixes FS#142lookshe2016-03-071-4/+0
| |/ |/|
* | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-0/+4
| |
* | Fixes FS#48 and FS#136lookshe2016-02-281-3/+0
| | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage
* | Packet sending helper moved to XmppSendUtil and methods in ↵steckbrief2016-02-231-0/+8
| | | | | | | | XmppConnectionService marked as deprecated
* | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-3/+3
| |
* | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
| |
* | Removed unnecessary dependencies to XmppConnectionService and added ↵steckbrief2016-02-231-0/+4
| | | | | | | | allowMessageCorrection to preferences
* | Imports organizedsteckbrief2016-02-1211-15/+3
| |
* | Simplification of DNS requests.steckbrief2016-02-121-0/+12
| | | | | | | | Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html)
* | Compilation errors and merge mixups fixedsteckbrief2016-02-112-6/+29
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-156-0/+280
|\| | | | | | | Cast problem fixed
| * Introducing some specialized IqPacketGeneratorssteckbrief2016-01-1510-87/+283
| | | | | | | | | | | | - IqPacketGenerator - PubSubPacketGenerator - AvatarPacketGenerator
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-154-65/+62
| | | | | | | | - publishAvatar moved from XmppConnectionService to AvatarService
| * Implements FS#111: Compress resized picture with PNG formatsteckbrief2016-01-151-3/+3
| |
| * Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-2/+12
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-132-0/+79
|\|
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-1319-239/+318
| | | | | | | | | | | | | | - 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
| * Publish avatars as PNGsteckbrief2016-01-131-1/+1
| |
| * 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
| * Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
| | | | | | | | Value of namespace constant changed to 'urn:xmpp:http:upload'
* | 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-169-11/+291
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-1614-198/+342
| | | | | | | | 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-111-0/+53
|\|
| * Removed stupid DNS query codesteckbrief2015-12-113-205/+147
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-106-128/+35
|\|
| * Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-1031-173/+97
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 10:09:01 +0000