aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | completely implements FS#161lookshe2016-03-173-14/+41
* | | partially implements FS#161lookshe2016-03-162-17/+49
* | | 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
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-4/+7
| |\ \
* | | | 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-06133-3509/+13072
|\|
| * Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-0/+4
| * Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-281-3/+0
| * Packet sending helper moved to XmppSendUtil and methods in XmppConnectionServ...steckbrief2016-02-231-0/+8
| * 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 allowMess...steckbrief2016-02-231-0/+4
| * Imports organizedsteckbrief2016-02-1211-15/+3
| * Simplification of DNS requests.steckbrief2016-02-121-0/+12
| * 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
| |\
| * \ 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
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-169-11/+291
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-111-0/+53
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-106-128/+35
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-7/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-025-7/+162
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-065-0/+560
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-038-1/+296
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-232-0/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge trz/rename into trz/rebasesteckbrief2015-10-222-0/+296
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | fix imports and namespacessteckbrief2015-10-051-0/+2
| * | | | | | | | | | | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-0/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fixed importstrz/1.5.2.2lookshe2015-10-054-10/+10
| * | | | | | | | | | | | | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-05131-27895/+0
* | | | | | | | | | | | | | | Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-092-2/+2
* | | | | | | | | | | | | | | implementation hint for FS#96 addedsteckbrief2016-02-091-0/+1
* | | | | | | | | | | | | | | Fixes FS#135: condition NOT message.isRead() added to check if notification s...steckbrief2016-02-091-6/+7
* | | | | | | | | | | | | | | Fixed minor class cast issuesteckbrief2016-01-161-4/+4
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Introducing some specialized IqPacketGeneratorssteckbrief2016-01-1510-87/+283
* | | | | | | | | | | | | | Moved all avatar related work to AvatarServicesteckbrief2016-01-154-65/+62