aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.4
| | | * 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 ↵trz/beta-1lookshe2016-04-033-3/+3
| | | | | | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
| * | 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
| | |
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-290-0/+0
| |\ \ | |/ / |/| | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
* | | Removed unnecessary importsteckbrief2016-03-291-1/+0
| | |
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-296-70/+103
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
* | | 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-2917-102/+246
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
* | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2917-102/+239
| | |
| * | 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-287-6/+68
|\ \ \
* | | | 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-272-2/+10
| | |\ \ | | |/ / | |/| |
| * | | adjusted changelog and corrected wrong version in build.gradle due to mergelookshe2016-03-272-3/+11
| | | |
| | * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-275-3/+57
| | |\ \ | | |/ / | |/| |
| * | | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-275-3/+57
|/ / /
| * | Merge branch 'trz/rename' (early part) into trz/rebaselookshe2016-03-270-0/+0
| |\ \ | |/ / |/| |
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2518-42/+96
|\| |
| * | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-2518-42/+95
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 20:57:53 +0000