aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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 branch 'trz/rebase' into trz/renamelookshe2016-04-0517-53/+196
| |\ | |/ |/|
| * Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
* | Merge tag '1.11.3' into trz/rebaselookshe2016-04-0517-53/+196
|\ \
| * | 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
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
* | | fixed installation error "W/PackageManager: Can't install because provider na...trz/beta-1lookshe2016-04-032-2/+2
* | | fixed build errorlookshe2016-04-031-0/+2
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-011-1/+6
|\ \ \
| * | | 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-303-0/+6
|\| |
| * | 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
| * | Removed unnecessary importsteckbrief2016-03-291-1/+0
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-296-70/+103
|\| |
| * | Avoid unnecessary text change on activate account buttonsteckbrief2016-03-291-2/+3
| * | Introduction of a TextViewUtil to easily set attributes for TextViewssteckbrief2016-03-296-69/+99
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-2916-101/+233
|\| |
| * | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2916-101/+226
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-283-5/+9
|\| |
| * | Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-283-3/+44
| |\ \
| * | | Fixes FS#170: Message Details: Status display has different Text colorsteckbrief2016-03-282-4/+2
| * | | Implements FS#176: error logging for httpupload improvedsteckbrief2016-03-281-1/+7
* | | | wrong import in new classtrz/1.11.2.1lookshe2016-03-271-1/+1
* | | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-273-3/+44
|\ \ \ \ | | |/ / | |/| |
| * | | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-273-3/+44
| |/ /
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2514-38/+83
| |\ \ | |/ / |/| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-2514-38/+82
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-236-30/+41
| * | only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| * | Typo `attempt`licaon-kter2016-03-221-1/+1
| * | show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| * | be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * | be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-202-3/+8
| * | don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-222-26/+42
|\ \ \ | | |/ | |/|
| * | Correct notifications to user if swiping with disabled or not connected accou...lookshe2016-03-221-25/+37
| * | Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\| |
| * | One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19