Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -59/+83 |
|\ | |||||
| * | Fixes FS#168 - Not possible to share more than one picture at once | lookshe | 2016-03-20 | 1 | -59/+83 |
| | | |||||
| * | fixed merge error | lookshe | 2016-03-20 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 3 | -19/+27 |
| |\ | |||||
| * \ | Merge branch 'trz/rebase' (early part) into trz/rename | lookshe | 2016-03-20 | 8 | -74/+115 |
| |\ \ | |||||
* | \ \ | Merge branch 'trz/rebase' into trz/merge_1.11.1 | lookshe | 2016-03-20 | 1 | -0/+20 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge branch 'trz/rename' into trz/rebase | lookshe | 2016-03-20 | 1 | -0/+20 |
| |\| | | | |/ | |/| | |||||
| | * | Fixes FS#167: Resized images are larger than original images | steckbrief | 2016-03-18 | 1 | -2/+2 |
| | | | |||||
| | * | Fixes FS#164 | lookshe | 2016-03-18 | 1 | -8/+0 |
| | | | |||||
| | * | Fixes FS#156 and FS#135 (occured again) | lookshe | 2016-03-17 | 1 | -4/+10 |
| | | | |||||
| | * | completely implements FS#161 | lookshe | 2016-03-17 | 3 | -14/+41 |
| | | | | | | | | | | | | save state of treatAsDownloadable() and set on error to specified value | ||||
| | * | partially implements FS#161 | lookshe | 2016-03-16 | 2 | -17/+49 |
| | | | | | | | | | | | | do not show download button on 404 | ||||
| | * | once again: FS#34 - review all calls for String.trim() | lookshe | 2016-03-14 | 2 | -4/+4 |
| | | | |||||
* | | | fixed merge errors | lookshe | 2016-03-20 | 1 | -1/+1 |
|/ / | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 2 | -88/+3 |
|\| | |||||
| * | Fixes FS#155: Check FileHelper vs. FileUtils | steckbrief | 2016-03-12 | 5 | -97/+16 |
| | | |||||
| * | Merge branch 'trz/rebase' into trz/rename | lookshe | 2016-03-12 | 7 | -55/+93 |
| |\ | |/ |/| | |||||
| * | Fixes FS#51: Change toggle in Account Management back to standard | steckbrief | 2016-03-11 | 3 | -77/+10 |
| | | |||||
* | | 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 | 133 | -3509/+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 | 11 | -15/+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 |
|\| |