Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge trz/rename into trz/rebase | steckbrief | 2015-10-22 | 1 | -7/+0 |
|\ | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-05 | 1 | -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/rebase | lookshe | 2015-10-05 | 1 | -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.conversationsplus | steckbrief | 2015-06-19 | 1 | -91/+0 |
| | | | | | | | | | | | | "renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed | ||||
* | | Fixes FS#37 - Remove special treatment of unicode hearts | lookshe | 2015-08-16 | 1 | -1/+1 |
|/ | | | | Fixes FS#34 - review all calls for String.trim() | ||||
* | changed received and read confirmation setting to one list and put it to ↵ | lookshe | 2015-04-14 | 1 | -1/+2 |
| | | | | settings class | ||||
* | added typing notifications through XEP-0085. fixed #210 | iNPUTmice | 2015-02-21 | 1 | -1/+2 |
| | |||||
* | support for XEP-0092: Software Version | iNPUTmice | 2015-02-16 | 1 | -4/+18 |
| | |||||
* | strip fractional seconds from timestamp before parsing | iNPUTmice | 2015-02-10 | 1 | -1/+1 |
| | |||||
* | made version codes ready for release candidate in beta channel | iNPUTmice | 2015-01-29 | 1 | -1/+1 |
| | |||||
* | fixed broken caps | iNPUTmice | 2015-01-28 | 1 | -9/+15 |
| | |||||
* | changed version code and version name to 1.0-beta2 | iNPUTmice | 2015-01-26 | 1 | -1/+1 |
| | |||||
* | adapt caps on whether or not message confirmation is on | iNPUTmice | 2015-01-26 | 1 | -6/+16 |
| | |||||
* | added changelog for 1.0 | iNPUTmice | 2015-01-19 | 1 | -1/+1 |
| | |||||
* | version bump to 0.10 | Daniel Gultsch | 2015-01-03 | 1 | -1/+1 |
| | |||||
* | store last message received date in conversation | iNPUTmice | 2014-12-10 | 1 | -0/+10 |
| | |||||
* | version bump to 0.9.3 | iNPUTmice | 2014-12-07 | 1 | -1/+1 |
| | |||||
* | version bump to 0.9.2 | iNPUTmice | 2014-12-03 | 1 | -1/+1 |
| | |||||
* | bumped cap version as well | iNPUTmice | 2014-12-01 | 1 | -1/+1 |
| | |||||
* | avoided some null pointers | iNPUTmice | 2014-11-17 | 1 | -1/+1 |
| | |||||
* | version bump to 0.8.3 + changelog | iNPUTmice | 2014-11-09 | 1 | -1/+1 |
| | |||||
* | version bump to 0.8.2 | iNPUTmice | 2014-11-06 | 1 | -1/+1 |
| | |||||
* | version bump to 0.8.1 | iNPUTmice | 2014-11-03 | 1 | -5/+6 |
| | |||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+48 |