aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-4/+5
|\
* | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+2
|\|
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-1/+8
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-121-82/+0
| |\ | |/ |/|
* | Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-122-87/+10
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-122-3/+31
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-1/+2
| |\ | |/ |/|
* | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-111-1/+2
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+4
|\|
* | 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-072-4/+43
|\|
| * corrected getRealPathFromUrilookshe2016-03-071-2/+40
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-177/+662
|\|
| * Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...steckbrief2016-02-231-0/+8
| * Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError)steckbrief2016-02-231-0/+15
| * Imports organizedsteckbrief2016-02-123-5/+0
| * Compilation errors and merge mixups fixedsteckbrief2016-02-111-0/+22
| * 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-162-0/+132
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-103-126/+3
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-023-5/+129
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-063-0/+526
| |\ \ \ \
| * | | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-0315-2075/+0
* | | | | | Moved all avatar related work to AvatarServicesteckbrief2016-01-132-0/+78
* | | | | | Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
| |_|_|_|/ |/| | | |
* | | | | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-162-0/+132
* | | | | Removed stupid DNS query codesteckbrief2015-12-111-150/+71
| |_|_|/ |/| | |
* | | | Moved logcat to a module, increased error robustness for loading last messagessteckbrief2015-12-107-132/+10
* | | | Fixed compile error in inner classsteckbrief2015-12-021-1/+1
| |_|/ |/| |
* | | Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-1/+1
* | | Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-207-17/+141
| |/ |/|
* | FileBackend splitted into several util classes for separate concerns: AvatarU...steckbrief2015-11-063-0/+523
|/
* Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-031-0/+43
* Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-211-5/+3
* Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-051-13/+2
* Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...steckbrief2015-10-041-0/+18
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-132/+3
* resolve of some compiler errorslookshe2015-08-131-0/+1
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-117-96/+661
* Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-0/+15
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1913-0/+1618