Commit graph

3347 commits

Author SHA1 Message Date
steckbrief
cbec38f02d Removed non-existing member variable 2016-02-23 13:11:50 +01:00
steckbrief
e429ba245e Explicit applicationId removed 2016-02-23 13:10:51 +01:00
steckbrief
5a351d9c11 Fix visibility of updateStatusMessages method that LoadMoreMessages can work 2016-02-23 13:10:09 +01:00
steckbrief
ccd352fa86 Resolved problem with closing sockets (java.lang.IncompatibleClassChangeError) 2016-02-23 13:08:51 +01:00
steckbrief
64049eb335 Removed unnecessary dependencies to XmppConnectionService and added allowMessageCorrection to preferences 2016-02-23 13:07:20 +01:00
steckbrief
0c22f68aef merged string resources 2016-02-23 13:02:37 +01:00
c5e60b43b8 Merge tag '1.10.0' into trz/merge_1.10.0
Conflicts:
	README.md
	build.gradle
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.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/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/res/layout/activity_edit_account.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-gl/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nb-rNO/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values-zh-rTW/strings.xml
	src/main/res/values/strings.xml
2016-02-22 14:36:35 +01:00
Daniel Gultsch
c20d8ac69e version bump to 1.10.0 2016-02-21 23:03:30 +01:00
Daniel Gultsch
d2cfac222e show load more messages when auto loading is disabled and messages are still left on server 2016-02-21 17:32:46 +01:00
Daniel Gultsch
b00c561f81 check for uuid change when decrypting pgp messages 2016-02-21 11:43:03 +01:00
Daniel Gultsch
ed740b4868 some mucs may grant voice to visitors in unmoderated rooms 2016-02-21 11:42:41 +01:00
Daniel Gultsch
43b466704a pulled translations from transifex 2016-02-20 10:25:23 +01:00
Daniel Gultsch
3bde4dbedb change uuid when replacing messages 2016-02-20 00:01:39 +01:00
Daniel Gultsch
e6f8b7d9fa decrypt pgp message corrections 2016-02-19 21:02:33 +01:00
Daniel Gultsch
a2cb009f4c skip avatar ui when pep is not available. fixes #1706 2016-02-19 20:54:53 +01:00
Daniel Gultsch
df992d2566 don't reset whisper on reInit. fixes #1637 2016-02-19 20:54:43 +01:00
Daniel Gultsch
ad60bc002c pulled translations from transifex 2016-02-19 11:14:16 +01:00
Daniel Gultsch
49a3f6f281 never parse show in presences as offline 2016-02-19 11:09:28 +01:00
Daniel Gultsch
ac687d6bbd don't log start reason 2016-02-17 16:52:57 +01:00
Daniel Gultsch
59978e157c only offer message correction for the very last message 2016-02-17 16:51:36 +01:00
Daniel Gultsch
3626e4b3a0 fixed regression that caused messages in muc not being send 2016-02-17 16:50:48 +01:00
Daniel Gultsch
c2fbdbde83 log reason why otr message won't be parsed 2016-02-16 14:22:47 +01:00
Daniel Gultsch
86b1865eec fixed regression that caused ui to redraw a lot 2016-02-16 14:22:21 +01:00
Daniel Gultsch
726393f8da version bump to 1.10.0-beta and changelog 2016-02-16 12:59:54 +01:00
Daniel Gultsch
349dd8291d made clear that archiving preferences are server side 2016-02-16 12:52:31 +01:00
Daniel Gultsch
c39008983e Merge pull request #1700 from petmue/master
Fixed some typos in the README.md
2016-02-16 12:27:29 +01:00
petmue
a27cbfbf56 Fixed some typos. 2016-02-16 12:18:43 +01:00
1e40764b20 Merge tag '1.9.4' into trz/merge_1.9.4
Conflicts:
	build.gradle
	src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
	src/main/java/eu/siacs/conversations/parser/PresenceParser.java
	src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/res/values/arrays.xml
2016-02-16 11:41:54 +01:00
Daniel Gultsch
7d63b06d84 Update README.md 2016-02-16 10:36:40 +01:00
Daniel Gultsch
d06013fbaf updated XEP list 2016-02-16 10:04:03 +01:00
Daniel Gultsch
a5e40672c1 added gcm values file to gitignore 2016-02-16 09:58:26 +01:00
Daniel Gultsch
a9b957e8a2 added setting to opt-out of message correction. renamed preferences and options to settings 2016-02-16 09:57:59 +01:00
Daniel Gultsch
0ca4a33bfb added some OTR logging 2016-02-16 09:15:41 +01:00
Daniel Gultsch
c0b3a3ff0c basic support for XEP-0308: Last Message Correction. fixes #864 2016-02-15 23:15:04 +01:00
Daniel Gultsch
335058b78b removed unnecessary conditions when sending read marker 2016-02-15 23:09:42 +01:00
Daniel Gultsch
c4b1df1bf3 add missing type='submit' attribute to enable push form 2016-02-15 22:12:39 +01:00
Daniel Gultsch
c3f0503a91 pulled translations from transifex 2016-02-15 12:35:35 +01:00
Daniel Gultsch
8ccb2005b3 only show load more messages button when mam is available
also update ui after that button has been pressed. fixes #1695
2016-02-14 23:53:17 +01:00
Daniel Gultsch
356199978e fixed server info push not showing up when unavailable 2016-02-14 18:19:11 +01:00
Daniel Gultsch
92a6e956fd be more carefull when checking push availability 2016-02-14 15:36:37 +01:00
Daniel Gultsch
300326fba3 deleted invalid gcm strings 2016-02-14 14:14:53 +01:00
Daniel Gultsch
251f2479c2 optional mode to close tcp connection when going into background
acts only when push is available. disable all non-push accounts to test properly
2016-02-14 13:20:23 +01:00
steckbrief
a049aff638 Fixes FS#105: XHTML par for images added 2016-02-13 21:50:19 +01:00
steckbrief
4829c301e6 Fix flagging no more messages on server for conversation 2016-02-13 21:22:14 +01:00
steckbrief
0af30b4aec Implements FS#64: Show who wrote last message in conversation overview 2016-02-13 21:18:31 +01:00
steckbrief
d84151487e Partially implements FS#6: Conference ID changed to c+bugs@conference.thedevstack.de 2016-02-13 21:11:45 +01:00
steckbrief
d2cafe58fa Fixes FS#135: condition NOT message.isRead() added to check if notification should be shown for a message 2016-02-13 21:08:28 +01:00
steckbrief
6a2c1a0dd5 Unused preference 'picture_compression'. This feature is configured in our variant via 'resize_picture' 2016-02-13 21:03:35 +01:00
steckbrief
3ac3917897 Fixed overwriting of changes for fixing FS#70. Unused method removed from generator classes. 2016-02-13 20:52:11 +01:00
Daniel Gultsch
6f9f871928 send push enable to server. simplified logging 2016-02-13 14:20:07 +01:00