| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-11 | 2 | -2/+3 | |
| |\| | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java | |||||
| | * | Fixes FS#139: Do not merge messages at all | steckbrief | 2016-03-11 | 8 | -149/+28 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-10 | 2 | -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 end | steckbrief | 2016-03-10 | 3 | -37/+45 | |
| | | | ||||||
| | * | Fixes FS#158: user decision dialog heading configurable and translateable | steckbrief | 2016-03-10 | 2 | -4/+6 | |
| | | | ||||||
| | * | reset link and highlight colors to system default | steckbrief | 2016-03-08 | 1 | -17/+20 | |
| | | | ||||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 31 | -477/+874 | |
| | |\ | |/ |/| | ||||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-08 | 1 | -1/+2 | |
| | |\ | |/ |/| | ||||||
| | * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-07 | 7 | -13/+49 | |
| | |\ | ||||||
| | * \ | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-06 | 134 | -3510/+13072 | |
| | |\ \ | ||||||
| | * | | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵ | steckbrief | 2016-02-09 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | should be shown for a message | |||||
| | * | | | implementation hint for FS#96 added | steckbrief | 2016-02-09 | 1 | -0/+1 | |
| | | | | | ||||||
| | * | | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵ | steckbrief | 2016-02-09 | 1 | -6/+7 | |
| | | | | | | | | | | | | | | | | | should be shown for a message | |||||
| | * | | | Fixed minor class cast issue | steckbrief | 2016-01-16 | 1 | -4/+4 | |
| | | | | | ||||||
| * | | | | use Build.VERSION_CODES.KITKAT instead of hard coded 19 | lookshe | 2016-03-08 | 1 | -1/+2 | |
| | |_|/ |/| | | ||||||
| * | | | corrected getRealPathFromUri | lookshe | 2016-03-07 | 1 | -2/+40 | |
| | | | | ||||||
| * | | | Finally fixes FS#142 | lookshe | 2016-03-07 | 1 | -4/+0 | |
| | |/ |/| | ||||||
| * | | Fixes FS#147: Disable OMEMO | steckbrief | 2016-03-02 | 1 | -0/+4 | |
| | | | ||||||
| * | | Fixes FS#48 and FS#136 | lookshe | 2016-02-28 | 1 | -3/+0 | |
| | | | | | | | | | | | - corrected preference "confirm_messages" to "confirm_messages_list" - removed unused "heart message" garbage | |||||
| * | | Packet sending helper moved to XmppSendUtil and methods in ↵ | steckbrief | 2016-02-23 | 1 | -0/+8 | |
| | | | | | | | | | XmppConnectionService marked as deprecated | |||||
| * | | Changed access to presences according to new Presence representation in C | steckbrief | 2016-02-23 | 1 | -3/+3 | |
| | | | ||||||
| * | | Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) | steckbrief | 2016-02-23 | 1 | -0/+15 | |
| | | | ||||||
| * | | Removed unnecessary dependencies to XmppConnectionService and added ↵ | steckbrief | 2016-02-23 | 1 | -0/+4 | |
| | | | | | | | | | allowMessageCorrection to preferences | |||||
| * | | Imports organized | steckbrief | 2016-02-12 | 12 | -16/+3 | |
| | | | ||||||
| * | | Simplification of DNS requests. | steckbrief | 2016-02-12 | 1 | -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 fixed | steckbrief | 2016-02-11 | 2 | -6/+29 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-15 | 6 | -0/+280 | |
| |\| | | | | | | | Cast problem fixed | |||||
| | * | Introducing some specialized IqPacketGenerators | steckbrief | 2016-01-15 | 10 | -87/+283 | |
| | | | | | | | | | | | | | - IqPacketGenerator - PubSubPacketGenerator - AvatarPacketGenerator | |||||
| | * | Moved all avatar related work to AvatarService | steckbrief | 2016-01-15 | 4 | -65/+62 | |
| | | | | | | | | | - publishAvatar moved from XmppConnectionService to AvatarService | |||||
| | * | Implements FS#111: Compress resized picture with PNG format | steckbrief | 2016-01-15 | 1 | -3/+3 | |
| | | | ||||||
| | * | Implements FS#64: Show who wrote last message in conversation overview | steckbrief | 2016-01-15 | 1 | -2/+12 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-01-13 | 2 | -0/+79 | |
| |\| | ||||||
| | * | Moved all avatar related work to AvatarService | steckbrief | 2016-01-13 | 19 | -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 PNG | steckbrief | 2016-01-13 | 1 | -1/+1 | |
| | | | ||||||
| | * | Fixes FS#107, Implements FS#77 | steckbrief | 2016-01-08 | 1 | -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-0363 | steckbrief | 2016-01-04 | 1 | -1/+1 | |
| | | | | | | | | | Value of namespace constant changed to 'urn:xmpp:http:upload' | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-17 | 1 | -1/+1 | |
| |\| | ||||||
| | * | Log error in case logcat command could not be executed; Show toast in case ↵ | steckbrief | 2015-12-17 | 1 | -1/+1 | |
| | | | | | | | | | nothing is copied | |||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 9 | -11/+291 | |
| |\| | ||||||
| | * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵ | steckbrief | 2015-12-16 | 14 | -198/+342 | |
| | | | | | | | | | distinguishes between image resizing and compressing/saving | |||||
| | * | Fixes FS#95: NPE when opening message details for failed file transfer | steckbrief | 2015-12-16 | 1 | -1/+2 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-11 | 1 | -0/+53 | |
| |\| | ||||||
| | * | Removed stupid DNS query code | steckbrief | 2015-12-11 | 3 | -205/+147 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-10 | 10 | -363/+10 | |
| |\| | ||||||
| | * | Moved logcat to a module, increased error robustness for loading last messages | steckbrief | 2015-12-10 | 35 | -407/+73 | |
| | | | ||||||
| | * | Fix flagging no more messages on server for conversation | steckbrief | 2015-12-06 | 3 | -2/+15 | |
| | | | ||||||
| | * | Implements FS#83: Reload from last received message | steckbrief | 2015-12-04 | 3 | -16/+44 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-04 | 1 | -7/+2 | |
| |\| | ||||||
| | * | Fixes FS#75 - Change color names to reasonable names | steckbrief | 2015-12-04 | 3 | -16/+9 | |
| | | | ||||||
| | * | Fixed compile error in inner class | steckbrief | 2015-12-02 | 1 | -1/+1 | |
| | | | ||||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |