aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge trz/rename into trz/rebasesteckbrief2015-10-221-7/+0
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-15/+2
|\| | | | | | | | | | | | | | | Manually merged conflicting files: src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/ui/AboutPreference.java
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-1/+2
|\| | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-91/+0
| | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
* | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-161-1/+1
|/ | | | Fixes FS#34 - review all calls for String.trim()
* changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-1/+2
| | | | settings class
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-1/+2
|
* support for XEP-0092: Software VersioniNPUTmice2015-02-161-4/+18
|
* strip fractional seconds from timestamp before parsingiNPUTmice2015-02-101-1/+1
|
* made version codes ready for release candidate in beta channeliNPUTmice2015-01-291-1/+1
|
* fixed broken capsiNPUTmice2015-01-281-9/+15
|
* changed version code and version name to 1.0-beta2iNPUTmice2015-01-261-1/+1
|
* adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-6/+16
|
* added changelog for 1.0iNPUTmice2015-01-191-1/+1
|
* version bump to 0.10Daniel Gultsch2015-01-031-1/+1
|
* store last message received date in conversationiNPUTmice2014-12-101-0/+10
|
* version bump to 0.9.3iNPUTmice2014-12-071-1/+1
|
* version bump to 0.9.2iNPUTmice2014-12-031-1/+1
|
* bumped cap version as welliNPUTmice2014-12-011-1/+1
|
* avoided some null pointersiNPUTmice2014-11-171-1/+1
|
* version bump to 0.8.3 + changelogiNPUTmice2014-11-091-1/+1
|
* version bump to 0.8.2iNPUTmice2014-11-061-1/+1
|
* version bump to 0.8.1iNPUTmice2014-11-031-5/+6
|
* Make conversations the root projectSam Whited2014-10-221-0/+48