aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-304-1/+7
|\
| * no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
| |
| * 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
|\| | | | | | | | | | | | | | | | | 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-285-3/+57
| |\
| * | 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-275-3/+57
|\ \ \ | | |/ | |/|
| * | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-275-3/+57
| |/
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-2516-39/+88
| |\ | |/ |/|
* | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-2516-39/+87
|\ \
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-238-31/+46
| | |
| * | 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-2332-317/+450
|\ \ \ | | |/ | |/|
| * | pulled from transifexlookshe2016-03-2332-317/+450
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-222-26/+42
|\| |
| * | 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
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\| |
| * | One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\| |
| * | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
|\| |
| * | FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
|\| |
| * | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
| | |
* | | 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-2014-179/+553
| |\ \ \
* | \ \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-207-38/+96
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-38/+96
| |\| | |
| | * | | Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
| | | | |
| | * | | Merge branch 'master' of git.fucktheforce.de:conversations-plussteckbrief2016-03-187-39/+96
| | |\ \ \
| | | * | | Fixes FS#164lookshe2016-03-181-8/+0
| | | | | |