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

3533 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
lookshe
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
Daniel Gultsch
c7a14092a8 fixed compile bug in free version 2016-02-13 00:03:57 +01:00
Daniel Gultsch
6217e33a87 removed gcm plugin from gradle. fixes #1693 2016-02-12 23:38:30 +01:00
Daniel Gultsch
c430848ade push gcm token on bind instead of every connect 2016-02-12 23:37:42 +01:00
steckbrief
65c2822dac Fixed settings synchronization 2016-02-12 22:55:27 +01:00
steckbrief
f24130321e Imports organized 2016-02-12 22:54:48 +01:00
steckbrief
c1069873ac Fixed parent activity for logoutput activity 2016-02-12 22:37:20 +01:00
steckbrief
3b6d3ee192 Simplification of DNS requests. 
Originally introduced for FS#92, but now extended with retrieval for XEP-0368 (http://xmpp.org/extensions/xep-0368.html)
 2016-02-12 22:20:57 +01:00
steckbrief
2028bb9b58 green bubbles and setting to choose green or white bubbles removed 2016-02-12 20:48:28 +01:00
steckbrief
2f1ac5ad18 Fixed placeholder string for message input box 2016-02-12 20:34:43 +01:00
steckbrief
fb06783aa6 Fixed layout issue with emojicon tastatur button 2016-02-12 19:29:04 +01:00
steckbrief
2168c73786 Fixed NPE while loading messages via MAM 2016-02-12 19:28:29 +01:00
steckbrief
97749cd8f7 Fixed runtime errors with axolotl libraries. 
Now the libraries from maven are added.
 2016-02-12 19:27:51 +01:00
Daniel Gultsch
bac249c8dd add play services to travis config 2016-02-12 12:06:35 +01:00
Daniel Gultsch
32da65f910 client side support for XEP-0357: Push Notifications 2016-02-12 11:39:27 +01:00