aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2514-38/+83
|\
| * FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+2
| |
| * Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
| |\
| * \ Merge branch 'trz/rebase' into trz/merge_1.11.1lookshe2016-03-201-0/+20
| |\ \
| | * \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-0/+20
| | |\ \
* | | | | Correct notifications to user if swiping with disabled or not connected ↵lookshe2016-03-221-25/+37
| | | | | | | | | | | | | | | | | | | | account (FS#159)
* | | | | Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
| | | | |
* | | | | One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
| | | | |
* | | | | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| | | | |
* | | | | FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
| |_|_|/ |/| | |
* | | | Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
| | | |
* | | | fixed merge errorlookshe2016-03-201-1/+1
| | | |
* | | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-203-19/+27
|\| | |
| * | | fixed merge errorslookshe2016-03-201-1/+1
| |/ /
* | / Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-208-74/+115
|\| | | |/ |/|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-122-88/+3
| |\
* | | Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
| | |
* | | Fixes FS#164lookshe2016-03-181-8/+0
| | |
* | | Fixes FS#156 and FS#135 (occured again)lookshe2016-03-171-4/+10
| | |
* | | completely implements FS#161lookshe2016-03-173-14/+41
| | | | | | | | | | | | save state of treatAsDownloadable() and set on error to specified value
* | | partially implements FS#161lookshe2016-03-162-17/+49
| | | | | | | | | | | | do not show download button on 404
* | | once again: FS#34 - review all calls for String.trim()lookshe2016-03-142-4/+4
| |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-127-55/+93
|\|
| * 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
| * \ 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#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
| |_|/ |/| |
* | | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| |/ |/|
* | 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
|\|
| * use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-077-13/+49
|\|
| * corrected getRealPathFromUrilookshe2016-03-071-2/+40
| |
| * Finally fixes FS#142lookshe2016-03-071-4/+0
| |
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06134-3510/+13072
|\|
| * 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-1212-16/+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
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-132-0/+79
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-171-1/+1
| |\ \ \