aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/utils (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-204-34/+176
|\
| * Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-294-34/+78
| * Fixes FS#230: Uncaught NullPointerException in DNSHelpersteckbrief2016-08-261-7/+12
| * Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-221-0/+10
| * Implements FS#227: Store password encrypted in internal databasesteckbrief2016-07-161-0/+110
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-05-092-0/+93
|\|
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-092-0/+91
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-233-0/+62
|\|
| * Fixes FS#204: Observe all used directoriessteckbrief2016-04-232-0/+44
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-182-1/+41
| |\
| | * Implements FS#137: build flavorssteckbrief2016-04-181-1/+1
| | * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-0/+40
| | |\ | |_|/ |/| |
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-0/+16
| |/
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-0/+40
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+48
|\|
| * Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+47
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-0/+36
| |\ | |/ |/|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
|\|
| * Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-291-0/+75
| * Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-13/+16
| * 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
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-4/+43
| |\
| * \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-177/+662
| |\ \
* | | | use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
| |_|/ |/| |
* | | corrected getRealPathFromUrilookshe2016-03-071-2/+40
| |/ |/|
* | 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
|\|
| * Moved all avatar related work to AvatarServicesteckbrief2016-01-132-0/+78
| * Fixes FS#99: Adjust namespace according to XEP-0363steckbrief2016-01-041-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-0/+132
|\|
| * Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-162-0/+132
| * Removed stupid DNS query codesteckbrief2015-12-111-150/+71
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-103-126/+3
|\|
| * 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
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-023-5/+129
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-1/+1