Commit Graph

1964 Commits

Author SHA1 Message Date
Daniel Gultsch
35d9e3fe4a Merge pull request #819 from SamWhited/spelling
Fix spelling in the docs / a method
2014-12-30 00:21:38 +01:00
Nathan Follens
800520b27b Update Dutch translations 2014-12-29 23:08:07 +01:00
Sam Whited
b48bddb852 Fix typo in method name 2014-12-29 14:21:20 -05:00
Sam Whited
c50903036d Rename observations doc file 2014-12-29 12:35:51 -05:00
Sam Whited
5a8391b539 Fix spelling in the docs
Also rewrap at 80 chars (which looked to be what it was at in most
places)
2014-12-28 19:48:01 -05:00
sergio
164c41661e Update spanish translations 2014-12-27 13:04:37 +01:00
Nathan Follens
4a8342a378 Update Dutch translations 2014-12-27 12:53:15 +01:00
kriztan
3b3d51b39a Update german translations 2014-12-27 10:42:15 +01:00
Daniel Gultsch
193d2645e6 code cleanup for change password stuff 2014-12-25 22:28:19 +01:00
Daniel Gultsch
0c22a8d1c6 added callback to change account password to notify UI on success / failure 2014-12-25 22:08:13 +01:00
Sam Whited
e4d9dca2fe Add ability to change password on server
Fixes #260
2014-12-25 21:38:55 +01:00
Daniel Gultsch
2081c1bef7 proper call to invalidateViews() 2014-12-25 19:53:56 +01:00
Daniel Gultsch
ef1f72ea27 catch another exception in fingerprint generation 2014-12-25 19:53:35 +01:00
Daniel Gultsch
94aeca7c8a Merge pull request #810 from kriztan/patch-2
Update german translations
2014-12-25 10:23:03 +01:00
Daniel Gultsch
384e1b4149 Merge pull request #809 from pulser/server-info-fix
Show server info option when blocking is unavailable
2014-12-25 10:22:47 +01:00
kriztan
3b127ab743 Update german translations 2014-12-25 09:14:34 +01:00
pulser
3ada834839 Show server info option when blocking is unavailable
Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available.
2014-12-24 20:54:56 +00:00
Daniel Gultsch
293e39c87a Merge pull request #807 from SamWhited/development
Misc minor bug fixes
2014-12-23 23:39:35 +01:00
Sam Whited
afbe727b17 Don't allow user to register domain only jids 2014-12-23 17:35:36 -05:00
Sam Whited
8a467e33dd Don't show menu on create account screen 2014-12-23 17:12:52 -05:00
Daniel Gultsch
7c02677531 Merge pull request #805 from SamWhited/removeoldvalidator
Remove old JID validator
2014-12-23 22:46:51 +01:00
Sam Whited
d454788011 Remove old JID validator 2014-12-23 13:23:13 -05:00
Daniel Gultsch
45ef112b0c Merge pull request #804 from SamWhited/server-info
Server info
2014-12-23 18:55:22 +01:00
Sam Whited
01107e31ae Add more server compatibility info.
Hide server info behind a checkbox.

Add XEP-0352 support to the server info list

Add XEP-0237 to server info list

Add XEP-0352 support to the server info list

Add MaM and Blocking to the account XEPs list

Also add a toggle button to hide some of the list
Rebase on current codebase

Make MAM string more descriptive

Change show more button to checkbox menu item

Shorten `MAM (History)' to `MAM'

Order XEP list and hide all by default

Supress warning (which is wrong anyways)

Change `Show more' to `Show more info'
2014-12-23 12:44:30 -05:00
iNPUTmice
58437b6f06 Merge branch 'SamWhited-verifyServerIqs' into development 2014-12-23 18:09:40 +01:00
iNPUTmice
d5f99560ff made method private that is no longer required to be public 2014-12-23 18:09:29 +01:00
Sam Whited
e152ed1e07 Simplify roster handling code
Merge result handling code into IqParser

Fixes #20
2014-12-22 12:53:31 -05:00
Daniel Gultsch
36f1b816a8 Merge pull request #802 from SamWhited/blockingfix
Fix NPEs in blocking code
2014-12-22 17:24:17 +01:00
Sam Whited
e1cb72b9ef Fix NPEs in blocking code 2014-12-22 11:24:08 -05:00
Daniel Gultsch
a94663aaa4 Merge pull request #796 from SamWhited/xep0191
XEP-0191 Support
2014-12-22 15:00:51 +01:00
Sam Whited
af7a64491f Add support for XEP-0191 (Blocking command)
Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-22 08:19:00 -05:00
iNPUTmice
9656970051 updated readme and xep list 2014-12-21 14:05:33 +01:00
iNPUTmice
1517641713 get rid of special self presence object and incorporate that into roster 2014-12-20 17:23:03 +01:00
iNPUTmice
ce4848f742 more null checks for otr fingerprints 2014-12-20 16:01:28 +01:00
iNPUTmice
40335785aa don't include empty fingerprints in list of otrfingerprints 2014-12-20 15:21:03 +01:00
iNPUTmice
6b047bed97 fixed another break continue bug 2014-12-20 12:52:45 +01:00
iNPUTmice
88f43643bf inject ui callback into running mam query 2014-12-20 12:52:08 +01:00
Daniel Gultsch
675bac7255 Merge pull request #794 from svetlemodry/development
Czech image transfer string fix
2014-12-20 12:14:11 +01:00
Daniel Gultsch
64ebbaec29 Merge pull request #797 from kruks23/translation
Update spanish translations
2014-12-20 12:14:03 +01:00
kruks23
6dd75cbb07 Update spanish translations 2014-12-20 10:54:23 +01:00
Jaroslav Lichtblau
c8cfd1b084 Czech image transfer string fix 2014-12-19 22:50:43 +01:00
iNPUTmice
a68cb5d364 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-12-19 13:40:35 +01:00
iNPUTmice
627982df90 fixed #755 2014-12-19 13:40:16 +01:00
Daniel Gultsch
11cb06eda5 Merge pull request #789 from svetlemodry/development
Czech translation updated
2014-12-19 01:12:42 +01:00
Jaroslav Lichtblau
7c4a306ae4 Czech translation updated
added missing strings
2014-12-18 18:42:50 +01:00
Daniel Gultsch
a8afc6ae8f Merge pull request #787 from kriztan/patch-1
Update german translations
2014-12-18 13:05:16 +01:00
kriztan
948112c2f3 Update german translations 2014-12-18 12:10:03 +01:00
iNPUTmice
f00e168752 clean up conversation history after swtiching to a different conversation 2014-12-17 21:05:47 +01:00
iNPUTmice
de952cc959 show error if jid couldn't be parsed in new contact dialog 2014-12-17 21:04:54 +01:00
iNPUTmice
c30108eb17 Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-12-17 10:51:28 +01:00