aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-114-37/+144
| * | | version bump to 1.11.6 + changelog1.11.6Daniel Gultsch2016-04-102-2/+6
| * | | pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| * | | add entries to gitignoreDaniel Gultsch2016-04-101-0/+2
| * | | don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
| * | | fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
| * | | moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
| * | | introduced setting to turn of notification ledDaniel Gultsch2016-04-093-5/+15
| * | | update gradle and gradle pluginDaniel Gultsch2016-04-093-4/+4
| * | | use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * | | don't show contact details when in conversations with selfDaniel Gultsch2016-04-093-1/+8
| * | | use last received message id when querying archiveDaniel Gultsch2016-04-091-7/+17
| * | | transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * | | add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
| * | | increase version code to fix nasty bug in 1.11.5 beta1.11.5Daniel Gultsch2016-04-081-1/+1
| * | | removed ernoexception in exchange for a regular exeption to prevent verify er...Daniel Gultsch2016-04-081-3/+2
| * | | version bump to 1.11.5 + changelogDaniel Gultsch2016-04-082-2/+5
| * | | pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| * | | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-074-2/+55
| * | | prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
| * | | tell people to build debug instead of releaseDaniel Gultsch2016-04-061-1/+1
| * | | version bump to 1.11.4 + changelog1.11.4Daniel Gultsch2016-04-052-2/+6
| * | | better detect broken pepDaniel Gultsch2016-04-052-2/+10
| * | | fixing travisDaniel Gultsch2016-04-042-4/+11
| * | | switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| * | | pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
| * | | removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
| * | | made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
| | * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-04-170-0/+0
| | |\ \ | |_|/ / |/| | / | | |/
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-162-3/+8
|\ \ \ | | |/ | |/|
| * | Fixed null pointer exception in case of IOException before uploading file to ...steckbrief2016-04-161-2/+7
| * | Fixes FS#197: Decrease verbosity of logging of 'skipping duplicate message'steckbrief2016-04-071-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-076-56/+131
|\| |
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-076-56/+129
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-0612-144/+135
|\| |
| * | Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-0612-144/+134
* | | Merge commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-04-060-0/+0
|\| |
| * | Merge branch 'trz/rebase' into trz/rename (skip beta logo)lookshe2016-04-060-0/+0
| |\ \ | |/ / |/| |
* | | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-0634-5/+740
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-0521-54/+201
| |\ \ | |/ / |/| |
* | | Merge tag '1.11.3' into trz/rebaselookshe2016-04-0521-55/+202
|\ \ \ | | |/ | |/|
| * | version bump to 1.11.3 and changelog1.11.3Daniel Gultsch2016-04-022-2/+6
| * | don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-023-6/+8
| * | check max http file size when attaching filesDaniel Gultsch2016-04-016-12/+83
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-315-12/+41
| * | save otr fingerprint in messageDaniel Gultsch2016-03-316-12/+15
| * | include form fields into caps hash calculationDaniel Gultsch2016-03-312-6/+25
| * | closed some cursors under error conditionsDaniel Gultsch2016-03-311-3/+13
| * | made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
| * | Merge pull request #1784 from kriztan/patch-2Daniel Gultsch2016-03-282-3/+3
| |\ \