aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-0/+75
|\ | | | | | | | | | | | | | | | | 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-293-2/+161
|\| | | | | | | | | | | | | | | | | | | | | 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-2916-101/+226
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-3/+1
|\|
| * 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-271-0/+20
|\ \ \ | | |/ | |/|
| * | 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
| |\ | |/ |/|
| * Correct notifications to user if swiping with disabled or not connected ↵lookshe2016-03-221-25/+37
| | | | | | | | account (FS#159)
| * Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
| |
| * One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
| |
| * Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| |
| * FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
| |
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+2
| |
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
|\|
| * Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
| |
| * fixed merge errorlookshe2016-03-201-1/+1
| |
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-203-19/+27
| |\
| * \ Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-208-74/+115
| |\ \
* | \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-0/+20
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-0/+20
| |\| | | | |/ | |/|
| | * Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
| | |
| | * Fixes FS#164lookshe2016-03-181-8/+0
| | |
| | * Fixes FS#156 and FS#135 (occured again)lookshe2016-03-171-4/+10
| | |
| | * completely implements FS#161lookshe2016-03-173-14/+41
| | | | | | | | | | | | save state of treatAsDownloadable() and set on error to specified value
| | * partially implements FS#161lookshe2016-03-162-17/+49
| | | | | | | | | | | | do not show download button on 404
| | * once again: FS#34 - review all calls for String.trim()lookshe2016-03-142-4/+4
| | |
* | | fixed merge errorslookshe2016-03-201-1/+1
|/ /
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-122-88/+3
|\|
| * Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-127-55/+93
| |\ | |/ |/|
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-2/+3
|\| | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java
| * Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-102-4/+7
|\| | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
| * Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-103-37/+45
| |
| * Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-102-4/+6
| |
| * reset link and highlight colors to system defaultsteckbrief2016-03-081-17/+20
| |
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0831-477/+874
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-077-13/+49
| |\
| * \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06134-3510/+13072
| |\ \
| * | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-092-2/+2
| | | | | | | | | | | | | | | | should be shown for a message
| * | | implementation hint for FS#96 addedsteckbrief2016-02-091-0/+1
| | | |
| * | | Fixes FS#135: condition NOT message.isRead() added to check if notification ↵steckbrief2016-02-091-6/+7
| | | | | | | | | | | | | | | | should be shown for a message
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 06:44:22 +0000