aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixes FS#180: Conference notification icon missinglookshe2016-04-011-1/+6
|
* Fixes FS#179: Avoid showing always empty list of ressources for mucssteckbrief2016-03-301-1/+3
|
* 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
|
* 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-2917-102/+239
|
* Merge branch 'master' of repos.thedevstack.de:conversations-plussteckbrief2016-03-285-3/+57
|\
| * Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-275-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
|/
* 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
| |\ \ | |/ / |/| |
| * | 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-207-4/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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-207-38/+96
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-38/+96
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | pulled from transifexlookshe2016-03-2332-317/+450
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | 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#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
| |_|_|/ / |/| | | |
* | | | | 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-2014-179/+553
|\| | | | | |_|/ / |/| | |
| * | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-1714-179/+553
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-163-30/+69
| | | | | | | | | | | | 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
| | * pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
| | |
| | * simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
| | |
| | * added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 04:36:51 +0000