archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3455 commits 48 branches 148 tags 28 MiB
Commit graph

3455 commits

This branch
This branch
All branches
Author SHA1 Message Date
steckbrief
74582979b3 Refs FS#140: Rework message display 
hide own avatar in message display
 2016-03-13 16:25:19 +01:00
steckbrief
a95d2d9134 Fixes FS#155: Check FileHelper vs. FileUtils 2016-03-12 21:14:55 +01:00
lookshe
14c2c72bc1 Merge branch 'trz/rebase' into trz/rename 2016-03-12 15:51:17 +01:00
lookshe
2a486c667a Merge branch 'trz/rebase' (early part) into trz/rename 2016-03-12 15:46:09 +01:00
lookshe
dc26c95b40 fixed possible NPE 2016-03-12 15:36:54 +01:00
lookshe
3dc635c6fd small bugfixes 2016-03-12 15:04:07 +01:00
lookshe
e72f409197 removed duplicated source 2016-03-12 14:15:39 +01:00
lookshe
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
steckbrief
bfc5000b6a Fixes FS#139: Do not merge messages at all 2016-03-11 21:31:30 +01:00
steckbrief
8585231be2 Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 
Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
 2016-03-10 23:03:19 +01:00
steckbrief
27c9c0aa21 Fixes FS#157: Trigger loading messages from MAM in MUC does not end 2016-03-10 22:54:13 +01:00
steckbrief
58ddfef266 Fixes FS#158: user decision dialog heading configurable and translateable 2016-03-10 21:13:59 +01:00
steckbrief
07c2aba59b Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase 
Conflicts:
	build.gradle
 2016-03-08 23:35:59 +01:00
steckbrief
9af0794911 Merge remote branch 'master' 2016-03-08 23:22:36 +01:00
steckbrief
a5243a8160 Fixes FS#145: Dialog for decision in Android 5 2016-03-08 23:15:05 +01:00
lookshe
85bb3f537a incremented version code 2016-03-08 22:47:54 +01:00
lookshe
a6442dd3ac Merge branch 'trz/rename' into trz/rebase 2016-03-08 22:24:47 +01:00
lookshe
b0e651aa93 Merge branch 'trz/rename' (early part) into trz/rebase 2016-03-08 22:24:21 +01:00
steckbrief
4b4ba6cff8 reset link and highlight colors to system default 2016-03-08 22:13:52 +01:00
lookshe
74d6d10cb7 Merge branch 'trz/rebase' into trz/rename 2016-03-08 21:13:24 +01:00
lookshe
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
lookshe
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
lookshe
7be757de90 Merge branch 'trz/rebase' into trz/rename 2016-03-08 01:01:33 +01:00
lookshe
f767a06842 use Build.VERSION_CODES.KITKAT instead of hard coded 19 2016-03-08 00:58:30 +01:00
lookshe
5eda297b14 Merge branch 'trz/rebase' into trz/rename 2016-03-07 23:42:13 +01:00
lookshe
c8759af913 Fixes FS#151 - Missing button on image-links 2016-03-07 23:39:41 +01:00
lookshe
6578ecfe0e corrected getRealPathFromUri 2016-03-07 23:37:51 +01:00
lookshe
e9b5793cef Finally fixes FS#142 2016-03-07 23:35:35 +01:00
lookshe
d620dcdc57 Merge branch 'trz/rebase' into trz/rename 2016-03-07 14:24:07 +01:00
lookshe
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
lookshe
3c400703e0 Merge branch 'trz/rebase' into trz/rename 2016-03-06 19:42:55 +01:00
lookshe
f28d77dc42 Fixes: FS#94 - wrong size on emojicon keyboard 2016-03-06 17:28:50 +01:00
lookshe
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