Dominik Schürmann
|
f6d678cbe5
|
Fix nullpointer with new OpenPgpSignatureResult version
|
2014-09-07 19:23:04 +02:00 |
|
Daniel Gultsch
|
5fe3f207d4
|
Merge pull request #426 from betheg/remove_strings
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
|
2014-09-07 17:13:10 +02:00 |
|
iNPUTmice
|
90947597e5
|
fixed #425
|
2014-09-07 16:53:10 +02:00 |
|
Michael
|
f4d86ecff3
|
deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.
|
2014-09-07 15:58:59 +02:00 |
|
iNPUTmice
|
27ad80afc2
|
trying to avoid rejectedexection
|
2014-09-07 15:11:40 +02:00 |
|
Daniel Gultsch
|
04665b59c8
|
Merge pull request #424 from betheg/bookmark_password
MUC: set the password from bookmarks.
|
2014-09-07 14:50:09 +02:00 |
|
Michael
|
ecd613dcdd
|
MUC: set the password from bookmarks.
|
2014-09-07 14:06:23 +02:00 |
|
iNPUTmice
|
d9990e6cd8
|
made shareing text with conferences possible again
|
2014-09-07 13:01:09 +02:00 |
|
iNPUTmice
|
b334ebd0fa
|
added missing breaks oO
|
2014-09-07 12:43:01 +02:00 |
|
iNPUTmice
|
890fb9a1b4
|
fixed npe
|
2014-09-07 00:09:12 +02:00 |
|
iNPUTmice
|
a2987edd95
|
readme formating
|
2014-09-06 20:07:31 +02:00 |
|
iNPUTmice
|
35553722e4
|
added recent contributors
|
2014-09-06 20:06:22 +02:00 |
|
iNPUTmice
|
9a945af6b9
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2014-09-06 18:21:38 +02:00 |
|
iNPUTmice
|
0e5a0a07fd
|
made otr a little bit more solid when there is no presence subscription
|
2014-09-06 18:21:31 +02:00 |
|
Daniel Gultsch
|
dfc5942bda
|
Merge pull request #422 from betheg/muc_password
MUC: set password from invite message.
|
2014-09-06 15:11:43 +02:00 |
|
Michael
|
375ec3a686
|
MUC: set password from invite message.
|
2014-09-05 22:07:35 +02:00 |
|
iNPUTmice
|
dc02137106
|
warn user if no presence subscription exists
|
2014-09-05 13:29:45 +02:00 |
|
iNPUTmice
|
34228d0e78
|
improved logging for avatar fetches
|
2014-09-05 13:29:20 +02:00 |
|
iNPUTmice
|
b8d289a932
|
fixed #342 - otr with facebook and other services without resources
|
2014-09-04 19:56:37 +02:00 |
|
iNPUTmice
|
01389e900b
|
reconnect accounts when resource has been changed in settings
|
2014-09-04 13:56:36 +02:00 |
|
iNPUTmice
|
9817251ed5
|
made muc password dialog hide the password (password field)
|
2014-09-04 11:46:13 +02:00 |
|
iNPUTmice
|
7a3bc5dc45
|
nick parsing (xep 0172) also enabled for messages and for pep
|
2014-09-04 10:50:06 +02:00 |
|
Daniel Gultsch
|
1d6c09e8ff
|
Merge pull request #397 from GZep/development
XEP-0172
|
2014-09-04 10:28:13 +02:00 |
|
Daniel Gultsch
|
50f90d37b8
|
Merge pull request #417 from emdete/unicode_emoticons
improve regex, implement pattern cache
|
2014-09-04 10:16:28 +02:00 |
|
Dominik Schürmann
|
ec234ebf01
|
Pull from transifex
|
2014-09-04 01:28:06 +02:00 |
|
iNPUTmice
|
6b9219c5f4
|
added support for password protected muc - fixed #203 and fixed #395
|
2014-09-03 19:35:45 +02:00 |
|
iNPUTmice
|
f19b1fb823
|
changed order of snackbar hints
|
2014-09-03 18:58:46 +02:00 |
|
M. Dietrich
|
0a2c73f246
|
improve emo mapping
|
2014-09-03 17:44:38 +02:00 |
|
M. Dietrich
|
0a686bc71c
|
use class, use codepoint
|
2014-09-03 17:29:13 +02:00 |
|
iNPUTmice
|
0f4ba6101c
|
set openpgp-api-lib to a version that actually works
|
2014-09-03 16:14:27 +02:00 |
|
iNPUTmice
|
ceddf99aa3
|
set openpgp-api-lib to a version that actually works
|
2014-09-03 16:13:49 +02:00 |
|
M. Dietrich
|
584984807e
|
make pattern static
|
2014-09-03 16:10:50 +02:00 |
|
M. Dietrich
|
cb3ba4045e
|
improve regex, implement pattern cache
|
2014-09-03 15:39:46 +02:00 |
|
iNPUTmice
|
2b941d19f8
|
more openpgp bug fixes
|
2014-09-03 15:39:35 +02:00 |
|
iNPUTmice
|
253438e698
|
more openpgp bug fixes
|
2014-09-03 15:33:44 +02:00 |
|
iNPUTmice
|
664c9c434f
|
avoiding resource conflicts
|
2014-09-03 14:57:40 +02:00 |
|
iNPUTmice
|
f1494f83ff
|
fixed pgp signature creation
|
2014-09-03 13:06:06 +02:00 |
|
iNPUTmice
|
5ae62f18b4
|
fixed pgp signature creation
|
2014-09-03 13:05:22 +02:00 |
|
iNPUTmice
|
1a09a4706b
|
added ability to disable notifications for specific conversations - fixed #322
|
2014-09-03 12:36:54 +02:00 |
|
iNPUTmice
|
1f378bffc8
|
made emoticon parsing enableable - default false
|
2014-09-03 09:15:07 +02:00 |
|
iNPUTmice
|
c1453db5df
|
Merge branch 'betheg-unused_resources' into development
|
2014-09-02 16:51:05 +02:00 |
|
iNPUTmice
|
3235c67e81
|
Merge branch 'unused_resources' of https://github.com/betheg/Conversations into betheg-unused_resources
|
2014-09-02 16:50:19 +02:00 |
|
Dominik Schürmann
|
9dd15131e1
|
Update README
|
2014-09-02 16:12:35 +02:00 |
|
Dominik Schürmann
|
bba03f2f2f
|
Update README
|
2014-09-02 16:11:46 +02:00 |
|
Dominik Schürmann
|
3bcf7266c3
|
Update README
|
2014-09-02 16:11:07 +02:00 |
|
iNPUTmice
|
97b52abaf9
|
fixed #410 by removing that config option
|
2014-09-02 16:00:03 +02:00 |
|
iNPUTmice
|
0ae852a633
|
refactored share with activity
|
2014-09-02 15:51:20 +02:00 |
|
iNPUTmice
|
567827ffca
|
fixed #406
|
2014-09-02 11:31:56 +02:00 |
|
iNPUTmice
|
c62937016b
|
rotate avatars
Conflicts:
src/eu/siacs/conversations/persistance/FileBackend.java
|
2014-09-02 11:31:39 +02:00 |
|
iNPUTmice
|
2c9b2e6bf8
|
fixed #406
|
2014-09-02 11:27:43 +02:00 |