|
|
74d6d10cb7
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-08 21:13:24 +01:00 |
|
|
|
f051dd0bcd
|
Fixes FS#153 - Check if url, phone and email are linkified correctly
|
2016-03-08 20:36:41 +01:00 |
|
steckbrief
|
d80e433e42
|
Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare
|
2016-03-08 12:56:02 +01:00 |
|
steckbrief
|
48f3922fe6
|
Fixed merge issue with AxolotlService (differentiation between impl and interface)
|
2016-03-08 12:55:03 +01:00 |
|
|
|
2b86b686c5
|
Merge tag '1.11.0' into trz/merge_1.11.0
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/entities/Conversation.java
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.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/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/res/values-bg/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pl/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-tr-rTR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
|
2016-03-08 10:49:47 +01:00 |
|
|
|
7be757de90
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-08 01:01:33 +01:00 |
|
|
|
f767a06842
|
use Build.VERSION_CODES.KITKAT instead of hard coded 19
|
2016-03-08 00:58:30 +01:00 |
|
|
|
5eda297b14
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-07 23:42:13 +01:00 |
|
|
|
c8759af913
|
Fixes FS#151 - Missing button on image-links
|
2016-03-07 23:39:41 +01:00 |
|
|
|
6578ecfe0e
|
corrected getRealPathFromUri
|
2016-03-07 23:37:51 +01:00 |
|
|
|
e9b5793cef
|
Finally fixes FS#142
|
2016-03-07 23:35:35 +01:00 |
|
|
|
d620dcdc57
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-07 14:24:07 +01:00 |
|
|
|
739ae02106
|
Fixes FS#150 - Swipe out conversation kills app
stacktrace told "java.lang.NoClassDefFoundError: com.nineoldandroids.view.ViewHelper"
|
2016-03-07 14:22:48 +01:00 |
|
Daniel Gultsch
|
1e75283250
|
version bump to 1.11.0
|
2016-03-07 11:06:41 +01:00 |
|
steckbrief
|
e9536210d7
|
Version bump to 0.0.6
|
2016-03-06 21:52:49 +01:00 |
|
Daniel Gultsch
|
24aefa109c
|
pulled translations from transifex
|
2016-03-06 21:35:59 +01:00 |
|
|
|
3c400703e0
|
Merge branch 'trz/rebase' into trz/rename
|
2016-03-06 19:42:55 +01:00 |
|
|
|
f28d77dc42
|
Fixes: FS#94 - wrong size on emojicon keyboard
|
2016-03-06 17:28:50 +01:00 |
|
|
|
83cbc2b33b
|
Implements: FS#142 - Fix Conference notifications
|
2016-03-06 17:28:09 +01:00 |
|
Daniel Gultsch
|
e6a9829dd2
|
don't show opt-out of battery optimization dialog when push is enabled
|
2016-03-06 15:53:49 +01:00 |
|
Daniel Gultsch
|
86fff5839a
|
warn in conversations when account is disabled
|
2016-03-06 12:16:29 +01:00 |
|
Daniel Gultsch
|
8339ebf3dc
|
version bump to 1.11.0-beta.3
|
2016-03-05 09:49:43 +01:00 |
|
Daniel Gultsch
|
d3542202b5
|
Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun018-Mess
|
2016-03-04 21:31:54 +01:00 |
|
Daniel Gultsch
|
e9b4a2a021
|
show host in file size checker
|
2016-03-04 21:30:34 +01:00 |
|
Daniel Gultsch
|
09d87965fb
|
mark oob messages and always display download button
|
2016-03-04 20:09:21 +01:00 |
|
Daniel Gultsch
|
aa24a0f779
|
don't automatically crop avatar
|
2016-03-04 14:32:38 +01:00 |
|
Daniel Gultsch
|
89eea3636f
|
add a few more know file extensions
|
2016-03-04 11:24:53 +01:00 |
|
Daniel Gultsch
|
07263370d9
|
allow to copy original url even while downloading. fixes #1743
|
2016-03-04 11:24:40 +01:00 |
|
Daniel Gultsch
|
cc67bfd8db
|
version bump to 1.11.0-beta.2
|
2016-03-03 14:07:48 +01:00 |
|
Daniel Gultsch
|
bc5f64bffe
|
moved avatarfetcher reset code to bind
|
2016-03-03 13:33:02 +01:00 |
|
Daniel Gultsch
|
4cb2d0ca93
|
avoid unnecessary disconnect. prevent NetworkOnMainThreadException
|
2016-03-03 13:31:59 +01:00 |
|
Daniel Gultsch
|
c9e4b332bf
|
don't break with srcoll events on empty message lists
|
2016-03-03 11:14:59 +01:00 |
|
steckbrief
|
5d21abac1d
|
Fixes FS#147: Disable OMEMO
|
2016-03-02 16:54:18 +01:00 |
|
steckbrief
|
c26f907263
|
Readme updated
|
2016-03-02 10:28:21 +01:00 |
|
steckbrief
|
6fb7738757
|
Fixes FS#146: Remove Tor-Support
|
2016-03-02 10:28:06 +01:00 |
|
steckbrief
|
f58407d0b8
|
Fixes FS#148: Remove 'store' hint from chat-markers
|
2016-03-02 09:36:31 +01:00 |
|
Daniel Gultsch
|
aaf64732b0
|
expert option to treat vibrate as silent mode for XA. fixes #1530
|
2016-03-01 19:00:18 +01:00 |
|
Daniel Gultsch
|
15a1873d97
|
removed unused config variable
|
2016-03-01 18:58:33 +01:00 |
|
Daniel Gultsch
|
fd246f7e5a
|
properly persist accepted crypto targets
|
2016-03-01 12:22:20 +01:00 |
|
Daniel Gultsch
|
ab4d86dde7
|
version bump to 1.11.0-beta, changelog and updated readme
|
2016-03-01 11:44:51 +01:00 |
|
Daniel Gultsch
|
198dc2c6b4
|
let users confirm each member in a conference even if that contact is already trusted
|
2016-03-01 11:26:59 +01:00 |
|
Tarun
|
df7b399e04
|
Fix Issue #1634 : Shows XMPP URI as links.
Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI.
|
2016-02-29 23:35:50 +05:30 |
|
Daniel Gultsch
|
134c75ae01
|
use correct jid when leaving a conference. fixes #1732
|
2016-02-29 16:32:24 +01:00 |
|
Daniel Gultsch
|
9e0466d1e6
|
refactored omemo to take multiple recipients
|
2016-02-29 13:18:07 +01:00 |
|
Daniel Gultsch
|
199ae3a4d8
|
rename purge keys positive button to 'purge keys'
|
2016-02-28 23:10:50 +01:00 |
|
steckbrief
|
59f47485cf
|
externalized string 'Retry decryption'
|
2016-02-28 21:54:47 +01:00 |
|
steckbrief
|
cd0c6ce48e
|
Merge tag '1.10.1' into trz/merge_1.10.1
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/entities/ListItem.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
src/main/res/menu/message_context.xml
src/main/res/xml/preferences.xml
|
2016-02-28 21:48:09 +01:00 |
|
Daniel Gultsch
|
4ba41540fd
|
made hashtable in roster store jids instead of strings
|
2016-02-28 20:45:50 +01:00 |
|
|
|
8fb6204288
|
Fixes FS#48 and FS#136
- corrected preference "confirm_messages" to "confirm_messages_list"
- removed unused "heart message" garbage
|
2016-02-28 19:17:03 +01:00 |
|
Daniel Gultsch
|
5cdfd0ec50
|
removed unneeded proguard files
|
2016-02-27 20:04:05 +01:00 |
|
