aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| |\ \
| | * | Update ShortcutBadger to version 1.1.4Christian S2016-03-272-3/+3
| |/ /
| | * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-04-050-0/+0
| | |\ | |_|/ |/| |
* | | Merge branch 'trz/rename' into trz/rebase (skip translation)lookshe2016-04-030-0/+0
|\ \ \ | | |/ | |/|
| * | conversations->conversations+lookshe2016-04-0329-327/+327
| * | Pulled translations from transifexlookshe2016-04-012-25/+31
| * | Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
* | | fixed installation error "W/PackageManager: Can't install because provider na...trz/beta-1lookshe2016-04-033-3/+3
* | | update build.gradle for betalookshe2016-04-031-2/+2
* | | fixed build errorlookshe2016-04-031-0/+2
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-013-26/+37
|\ \ \
| * | | Pulled translations from transifexlookshe2016-04-012-25/+31
| * | | Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-301-1/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
| |/ /
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-309-32/+61
|\| |
| * | no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
| * | Fixes FS#174: Displaying of ASCII emoticons differslookshe2016-03-305-31/+54
| * | Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-20/+9
|\| |
| * | Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:26:24 +0000