Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-12-16 | 1 | -1/+2 |
|\ | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-11-06 | 1 | -10/+8 |
|\| | |||||
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2015-10-23 | 1 | -2/+3 |
|\| | |||||
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplus | steckbrief | 2015-06-19 | 1 | -369/+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 | -2/+2 |
| | | | | | | | | Fixes FS#34 - review all calls for String.trim() | ||||
* | | Merge tag '1.5.2' into trz/rebase | lookshe | 2015-08-11 | 1 | -8/+12 |
|/ | |||||
* | implementation for downloading only when enabled wlan | lookshe | 2015-04-12 | 1 | -0/+3 |
| | |||||
* | no trim of messages or password | lookshe | 2015-04-11 | 1 | -1/+1 |
| | | | | check password with only spaces separately | ||||
* | do not check image file size over http if accepted file size is 0 | Daniel Gultsch | 2015-01-11 | 1 | -3/+6 |
| | |||||
* | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-15 | 1 | -20/+1 |
| | |||||
* | support for pgp files | iNPUTmice | 2014-11-15 | 1 | -2/+4 |
| | |||||
* | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 1 | -7/+7 |
| | | | | Remove `Account.getFullJid()' | ||||
* | Move a chunk of classes over to using JID objects | Sam Whited | 2014-11-09 | 1 | -27/+13 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -18/+27 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+385 |