Commits · 4b2e06b9c34e24b73a5e324e6d082fe817044729 · Android-smartphones / Conversations

Sep 09, 2014
- version bump, changelog and one last minute change for OTR · 4b2e06b9
  iNPUTmice authored Sep 09, 2014
  
  4b2e06b9
- Merge branch 'master' of github.com:siacs/Conversations · c02ef800
  iNPUTmice authored Sep 09, 2014
```
Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java
```
  c02ef800
- don't reset images from sending to waiting · facb1242
  iNPUTmice authored Sep 09, 2014
  
  facb1242
Sep 08, 2014
- setting to increase font size. fixed #420 · d92e8381
  iNPUTmice authored Sep 08, 2014
  
  d92e8381
- hide encryption settings under 'expert options' · d9c4637b
  iNPUTmice authored Sep 08, 2014
  
  d9c4637b
- bumped openpgp-api to version 5 · 3f77e5fa
  iNPUTmice authored Sep 08, 2014
  
  3f77e5fa
- simplefied some code that might have been the source for some strange bugs · 1871521a
  iNPUTmice authored Sep 08, 2014
  
  1871521a
- introduced downloadable interface. reverted some of the changes made to OTR · b23f8bd4
  iNPUTmice authored Sep 08, 2014
  
  b23f8bd4
- bug fixes for forcing encryption · a6f0f0cb
  iNPUTmice authored Sep 08, 2014
  
  a6f0f0cb
- fixed sending offline pgp messages · 5cb11396
  iNPUTmice authored Sep 08, 2014
  
  5cb11396
- settings to force encryption and setting for not saving messages to disk. fixed #353 · 58953e61
  iNPUTmice authored Sep 08, 2014
  
  58953e61
- don't fail displayed or received messages · 3b9fd28e
  iNPUTmice authored Sep 08, 2014
  
  3b9fd28e
- warn on missing presence subscription · 19f98f51
  iNPUTmice authored Sep 08, 2014
  
  19f98f51
Sep 07, 2014
- Merge branch 'development' of github.com:siacs/Conversations into development · 409fdd85
  iNPUTmice authored Sep 07, 2014
  
  409fdd85
- fixed #321 - delete otr fingerprints · 449c2a54
  iNPUTmice authored Sep 07, 2014
  
  449c2a54
- Merge pull request #426 from betheg/remove_strings · 5fe3f207
  Daniel Gultsch authored Sep 07, 2014
```
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
```
  5fe3f207
- fixed #425 · 90947597
  iNPUTmice authored Sep 07, 2014
  
  90947597
- deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. · f4d86ecf
  Michael authored Sep 07, 2014
  
  f4d86ecf
- trying to avoid rejectedexection · 27ad80af
  iNPUTmice authored Sep 07, 2014
  
  27ad80af
- Merge pull request #424 from betheg/bookmark_password · 04665b59
  Daniel Gultsch authored Sep 07, 2014
```
MUC: set the password from bookmarks.
```
  04665b59
- MUC: set the password from bookmarks. · ecd613dc
  Michael authored Sep 07, 2014
  
  ecd613dc
- made shareing text with conferences possible again · d9990e6c
  iNPUTmice authored Sep 07, 2014
  
  d9990e6c
- added missing breaks oO · b334ebd0
  iNPUTmice authored Sep 07, 2014
  
  b334ebd0
Sep 06, 2014
- fixed npe · 890fb9a1
  iNPUTmice authored Sep 07, 2014
  
  890fb9a1
- readme formating · a2987edd
  iNPUTmice authored Sep 06, 2014
  
  a2987edd
- added recent contributors · 35553722
  iNPUTmice authored Sep 06, 2014
  
  35553722
- Merge branch 'development' of github.com:siacs/Conversations into development · 9a945af6
  iNPUTmice authored Sep 06, 2014
  
  9a945af6
- made otr a little bit more solid when there is no presence subscription · 0e5a0a07
  iNPUTmice authored Sep 06, 2014
  
  0e5a0a07
- Merge pull request #422 from betheg/muc_password · dfc5942b
  Daniel Gultsch authored Sep 06, 2014
```
MUC: set password from invite message.
```
  dfc5942b
Sep 05, 2014
- MUC: set password from invite message. · 375ec3a6
  Michael authored Sep 05, 2014
  
  375ec3a6
- warn user if no presence subscription exists · dc021371
  iNPUTmice authored Sep 05, 2014
  
  dc021371
- improved logging for avatar fetches · 34228d0e
  iNPUTmice authored Sep 05, 2014
  
  34228d0e
Sep 04, 2014
- fixed #342 - otr with facebook and other services without resources · b8d289a9
  iNPUTmice authored Sep 04, 2014
  
  b8d289a9
- reconnect accounts when resource has been changed in settings · 01389e90
  iNPUTmice authored Sep 04, 2014
  
  01389e90
- made muc password dialog hide the password (password field) · 9817251e
  iNPUTmice authored Sep 04, 2014
  
  9817251e
- nick parsing (xep 0172) also enabled for messages and for pep · 7a3bc5dc
  iNPUTmice authored Sep 04, 2014
  
  7a3bc5dc
- Merge pull request #397 from GZep/development · 1d6c09e8
  Daniel Gultsch authored Sep 04, 2014
```
XEP-0172
```
  1d6c09e8
- Merge pull request #417 from emdete/unicode_emoticons · 50f90d37
  Daniel Gultsch authored Sep 04, 2014
```
improve regex, implement pattern cache
```
  50f90d37
Sep 03, 2014
- added support for password protected muc - fixed #203 and fixed #395 · 6b9219c5
  iNPUTmice authored Sep 03, 2014
  
  6b9219c5
- changed order of snackbar hints · f19b1fb8
  iNPUTmice authored Sep 03, 2014
  
  f19b1fb8