dd8dac73d2
Merge branch 'trz/rename' into trz/rebase
2016-03-20 20:16:35 +01:00
00fc37b326
changed configuration to conversations+ project (FS#32)
2016-03-20 20:13:59 +01:00
1d9a840c0b
Merge branch 'trz/rename' into trz/rebase
2016-03-20 17:57:22 +01:00
9bcacdb8b9
Show file name instead of mime type (FS#102)
2016-03-20 17:56:01 +01:00
a8db6be4eb
Merge branch 'trz/rename' into trz/rebase
2016-03-20 17:37:44 +01:00
ea6564c81a
FS#104 - Fix Message.equals()
2016-03-20 17:28:39 +01:00
d1e2023bd9
Merge branch 'trz/rename' into trz/rebase
2016-03-20 16:15:43 +01:00
90bbe035e9
Fixes FS#143 - Displaying of emoticons too large
2016-03-20 16:15:17 +01:00
50dad467ee
Merge branch 'trz/rename' into trz/rebase
2016-03-20 15:14:42 +01:00
d535496598
Merge branch 'trz/rename' (early part) into trz/rebase
2016-03-20 15:14:36 +01:00
89082f1c68
Fixes FS#168 - Not possible to share more than one picture at once
2016-03-20 13:04:27 +01:00
a92ef6f077
fixed merge error
2016-03-20 02:34:01 +01:00
75c8a4a695
Merge branch 'trz/rebase' (early part) into trz/rename
2016-03-20 02:31:09 +01:00
ad8e8344c0
Merge branch 'trz/rebase' (early part) into trz/rename
2016-03-20 02:29:46 +01:00
6de11f38ea
Merge branch 'trz/rebase' (early part) into trz/rename
2016-03-20 02:27:01 +01:00
c9b7ed3d3f
Merge branch 'trz/rebase' into trz/merge_1.11.1
2016-03-20 02:14:45 +01:00
d89d7a3000
Merge branch 'trz/rename' into trz/rebase
2016-03-20 02:13:20 +01:00
98e61f189c
fixed merge errors
2016-03-20 01:59:41 +01:00
steckbrief
b99714161b
Fixes FS#167: Resized images are larger than original images
2016-03-18 17:19:37 +01:00
steckbrief
f5b684ab6b
Merge branch 'master' of git.fucktheforce.de:conversations-plus
2016-03-18 17:13:36 +01:00
6758676691
Fixes FS#164
2016-03-18 09:08:18 +01:00
b5d1ee194c
Fixes FS#156 and FS#135 (occured again)
2016-03-17 23:08:58 +01:00
cb55d2af52
completely implements FS#161
...
save state of treatAsDownloadable() and set on error to specified value
2016-03-17 22:14:49 +01:00
fb00372269
Merge tag '1.11.1' into trz/merge_1.11.1
...
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
2016-03-17 15:56:54 +01:00
0de9c2aa23
partially implements FS#161
...
do not show download button on 404
2016-03-16 18:45:18 +01:00
Daniel Gultsch
c4b1f6171d
version bump to 1.11.1 and changelog
2016-03-16 18:12:36 +01:00
Daniel Gultsch
b17ca3543f
made it possible to share text files
2016-03-16 18:09:19 +01:00
Daniel Gultsch
48be5af55f
reworked sharewith activity to stay open during sharing
...
closing the activity prematuraly caused uri permissions to be revoked
2016-03-16 10:46:33 +01:00
Daniel Gultsch
323d31ba05
Merge pull request #1767 from fiaxh/path_file_accessible
...
Check if path for URI is accessible
2016-03-16 10:44:13 +01:00
fiaxh
eaddfa7fd1
Check if path for URI is accessible
...
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
2016-03-15 11:42:13 +01:00
25d3aba4d7
Merge branch 'trz/rename' into trz/rebase
2016-03-15 09:18:03 +01:00
76a1937745
once again: FS#34 - review all calls for String.trim()
2016-03-14 23:39:44 +01:00
Daniel Gultsch
678bc7b4d4
removed requirement of external component for http upload
2016-03-14 12:16:36 +01:00
Daniel Gultsch
815c534da8
pulled translations from transifex
2016-03-13 17:43:43 +01:00
Daniel Gultsch
0af8ee341c
simplified getUsers(max) code
2016-03-13 17:42:17 +01:00
Daniel Gultsch
1153e6120d
added logging in case fragment wasn't attached
2016-03-13 17:41:38 +01:00
Daniel Gultsch
290f53f4a6
fixed recursive call instead of call to super in PublishProfileActivity
2016-03-13 17:39:13 +01:00
steckbrief
74582979b3
Refs FS#140: Rework message display
...
hide own avatar in message display
2016-03-13 16:25:19 +01:00
steckbrief
340272ba84
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
2016-03-12 21:22:44 +01:00
steckbrief
86afdc7aaf
Merge commit 'remotes/origin/trz/rename~1' into trz/rebase
2016-03-12 21:21:32 +01:00
steckbrief
a95d2d9134
Fixes FS#155: Check FileHelper vs. FileUtils
2016-03-12 21:14:55 +01:00
14c2c72bc1
Merge branch 'trz/rebase' into trz/rename
2016-03-12 15:51:17 +01:00
2a486c667a
Merge branch 'trz/rebase' (early part) into trz/rename
2016-03-12 15:46:09 +01:00
dc26c95b40
fixed possible NPE
2016-03-12 15:36:54 +01:00
3dc635c6fd
small bugfixes
2016-03-12 15:04:07 +01:00
e72f409197
removed duplicated source
2016-03-12 14:15:39 +01:00
bf49abe865
Added method to get body from message if hasMeCommand and harmonized extraction of fileextension (FS#38)
2016-03-12 02:28:22 +01:00
steckbrief
3041cc74ce
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
...
Conflicts:
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
src/main/java/eu/siacs/conversations/ui/widget/Switch.java
src/main/res/layout/account_row.xml
src/main/res/layout/contact_key.xml
2016-03-11 23:51:10 +01:00
steckbrief
a444402644
Fixes FS#51: Change toggle in Account Management back to standard
2016-03-11 23:44:59 +01:00
steckbrief
864bb77883
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
...
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
2016-03-11 21:34:10 +01:00
