aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2015-09-1526-37/+193
|\
| * Merge pull request #1409 from sespivak/masterDaniel Gultsch2015-09-141-0/+14
| |\
| | * some string localization for russian languageSergey Spivak2015-09-141-0/+14
| * | pulled translations from transifexDaniel Gultsch2015-09-1420-20/+0
| |/
| * changed http upload namespace to reflect the one in the XEPDaniel Gultsch2015-09-141-1/+1
| * added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-135-16/+62
| * pulled new translations from transifexDaniel Gultsch2015-09-137-0/+116
| * added mp4 to well known extensions. fixes #1403Daniel Gultsch2015-09-121-1/+1
* | Version 1.6.9Christian S2015-09-1213-78/+219
|\|
| * increased dns timeoutDaniel Gultsch2015-09-102-1/+2
| * added alt as possible modifier key. use mod+(0..9) to jump to a conversationDaniel Gultsch2015-09-092-26/+46
| * added rotation detection to up/down navigationDaniel Gultsch2015-09-071-4/+23
| * added some key bindingDaniel Gultsch2015-09-073-5/+87
| * catch npe in setupIme methodDaniel Gultsch2015-09-071-1/+3
| * indicate broken pep in server infoDaniel Gultsch2015-09-063-1/+12
| * Only show that have sessions in fingerprint listAndreas Straub2015-09-067-50/+58
| * Don't manually add keys to the storeAndreas Straub2015-09-061-2/+0
* | added some toasts to UpdaterActivityChristian S2015-09-063-1/+15
* | disable ActionBar buttonsChristian S2015-09-061-0/+5
* | version 1.6.9 betaChristian S2015-09-0612-13/+417
* | Merge pull request #34 from siacs/masterChristian S.2015-09-058-45/+122
|\|
| * add null pointer check to db migrationDaniel Gultsch2015-09-051-1/+5
| * Never build a session with oneselfAndreas Straub2015-09-053-20/+68
| * ignore timeout exceptions on secondary dns requestsDaniel Gultsch2015-09-051-9/+21
| * Issues with URLs with multiple dots in file. fixes #1373Daniel Gultsch2015-09-041-7/+15
| * invoke onEnterPressed callback only if shift is not pressedDaniel Gultsch2015-09-041-1/+1
| * minimize softkeyboard only if it has been in fullscreen modeDaniel Gultsch2015-09-041-1/+3
| * show an send button instead of the enter key in softkeyboards when enterIsSen...Daniel Gultsch2015-09-042-7/+10
* | modified publish avatar layoutChristian S2015-09-051-65/+94
* | modified avatar size in publish avatar activityChristian S2015-09-041-1/+1
* | resize AvatarsChristian S2015-09-041-1/+1
* | Merge pull request #33 from siacs/masterChristian S.2015-09-047-13/+25
|\|
| * Ensure uris is empty before onStart adds to itAndreas Straub2015-09-021-0/+1
| * added special error state for dns timeoutDaniel Gultsch2015-09-014-4/+13
| * use same method to add message hints to otr message everywhere it is neededDaniel Gultsch2015-09-012-9/+11
* | Merge pull request #32 from siacs/masterChristian S.2015-09-013-1/+8
|\|
| * tag axolotl messages with pretty-please-storeDaniel Gultsch2015-09-011-0/+1
| * made useImageAsIs determination a bit more foolproof (samsung)Daniel Gultsch2015-08-311-1/+6
| * single task mode for start conversations activityDaniel Gultsch2015-08-301-0/+1
* | resize avatar image in publish profile viewChristian S2015-09-011-1/+1
* | Merge pull request #31 from siacs/masterChristian S.2015-08-304-4/+22
|\|
| * fixed bug that prevented newly opened conversations to load the entire histor...Daniel Gultsch2015-08-303-1/+14
| * catch invalid base64 on omemo key decodingDaniel Gultsch2015-08-301-3/+8
* | copy commitsChristian S2015-08-2932-56/+126
|\|
| * use build in method on >= lolipop devices to discover dns serversDaniel Gultsch2015-08-282-8/+41
| * pulled updated translations from transifexDaniel Gultsch2015-08-2820-20/+7
| * reformating and upper bound for waiting on stanza writerDaniel Gultsch2015-08-281-8/+16
| * fixed type=timeoutDaniel Gultsch2015-08-281-0/+2
| * added XEP number for http file uploadDaniel Gultsch2015-08-277-7/+40
| * use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-266-9/+10