aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Logging for FS#80 to identify calling methodlookshe2016-03-303-0/+6
|
* Fixes FS#172: Conversations list not updated on status changessteckbrief2016-03-291-20/+9
|
* Removed unnecessary importsteckbrief2016-03-291-1/+0
|
* 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
|
* Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-2916-101/+226
|
* Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-283-3/+44
|\
| * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-273-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
|/
* 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
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
| |\ \
| * \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
| |\ \ \
| * \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
| |\ \ \ \
| * \ \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-206-37/+94
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-206-37/+94
| | |\ \ \ \ \ \
* | | | | | | | | 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
| |_|_|/ / |/| | | |
* | | | | 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
|\| | | |
| * | | | fixed merge errorslookshe2016-03-205-21/+29
| | | | |
* | | | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-208-74/+115
|\| | | | | |_|/ / |/| | |
| * | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-178-74/+115
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
| | * made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| | |
| | * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66
| | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
| | * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| | | | | | | | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider
| | * simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
| | |
| | * added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| | |
| | * fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
| | |
| | * log reason for bind failureDaniel Gultsch2016-03-111-2/+2
| | |
| | * close cursor in caps db queryDaniel Gultsch2016-03-111-1/+3
| | |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-152-4/+4
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-125-97/+16
| |\ \ \
* | | | | 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
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 22:08:25 +0000