Commit Graph

1267 Commits

Author SHA1 Message Date
JC Brand
b3cae1b1f5 Update doc details on reverse-proxying the connection manager 2013-09-13 12:44:16 +02:00
JC Brand
373b235d30 Merge branch 'master' into 0.6.x 2013-09-13 12:18:55 +02:00
JC Brand
be66284748 Add a test for /clear functionality 2013-09-13 12:18:49 +02:00
JC Brand
960861ad78 Add a test for /clear functionality 2013-09-13 12:18:27 +02:00
JC Brand
7a57712434 Update CHANGES.rst 2013-09-13 10:58:39 +02:00
JC Brand
367803d6ef The xa chat state wasn't being handled properly 2013-09-13 10:58:00 +02:00
JC Brand
cc37d6a183 The xa chat state wasn't being handled properly 2013-09-13 10:57:53 +02:00
JC Brand
59fc3182b1 The xa chat state wasn't being handled properly 2013-09-13 10:57:28 +02:00
JC Brand
f8cad74a74 Update CHANGES.rst 2013-09-13 10:38:31 +02:00
JC Brand
e33b8d34e5 Regenerated POT and PO files 2013-09-13 10:35:51 +02:00
JC Brand
b34a706132 We didn't have an icon for unavailable state.
Also, the status description was not translation aware
2013-09-13 10:35:37 +02:00
JC Brand
f6884d90db Regenerated PO and POT files 2013-09-13 10:35:25 +02:00
JC Brand
8977505f11 We didn't have an icon for unavailable state.
Also, the status description was not translation aware
2013-09-13 10:35:00 +02:00
JC Brand
f15eb5a7d4 Remove messages from localStorage when calling /clear 2013-09-13 09:59:06 +02:00
JC Brand
0dd4b3e52c Remove messages from localStorage when calling /clear 2013-09-13 09:57:14 +02:00
JC Brand
d402ed8e8e Merge branch 'master' into otr
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
2013-09-12 20:57:51 +02:00
JC Brand
84915290b2 Correct version is 0.6.3 2013-09-12 16:00:31 +02:00
JC Brand
8b5287dc05 Merge branch 'master' of github.com:jcbrand/converse.js 2013-09-12 15:53:09 +02:00
JC Brand
008bac4f21 Bump version and minimize files. 2013-09-12 15:51:30 +02:00
JC Brand
d4375029a7 Bump version and minimize files. 2013-09-12 15:49:44 +02:00
JC Brand
68a9909311 Bump version everywhere and regenerate docs. 2013-09-12 15:33:11 +02:00
JC Brand
37f3a95a20 For uniqueness, we need both JIDs for messages localStorage Fixes #49 2013-09-12 15:30:09 +02:00
JC Brand
4ab6f28181 Bugfix. Messages were stored against buddy JID and not own JID 2013-09-12 15:24:56 +02:00
JC Brand
a33e370cec Merge new translations into the PO files 2013-09-12 11:21:21 +02:00
JC Brand
6c84f1e94c Regenerated docs 2013-09-12 11:14:58 +02:00
JC Brand
0ef6a727eb Add new Makefile step "merge" and document it. 2013-09-12 11:14:45 +02:00
JC Brand
9734ccdeff The word 'me' wasn't translation aware.
Conflicts:
	locale/converse.pot
2013-09-12 08:37:41 +02:00
JC Brand
00cb015d6a Merge branch 'master' into otr
Conflicts:
	converse.js
2013-09-10 23:33:30 +02:00
JC Brand
778b8a7c2e The word 'me' wasn't translation aware. 2013-09-10 23:31:29 +02:00
JC Brand
cf6c1e2140 Update af translations 2013-09-10 23:31:09 +02:00
JC Brand
4bb22b5c97 Translated strings may not be broken up. Regenerated POT file 2013-09-10 22:52:15 +02:00
JC Brand
1d44c60ba7 Don't change color when hovering over .toggle-otr 2013-09-10 22:42:05 +02:00
JC Brand
1574acb37b Save the private key and instance tag in session storage. 2013-09-10 22:37:12 +02:00
JC Brand
9967b955c8 Show an alert before generating private key
To make it clear to the user that the browser might freeze up while generating
the key.
2013-09-08 18:13:49 +02:00
JC Brand
36c2a2ac45 Add option to hide the toolbar 2013-09-08 16:56:38 +02:00
JC Brand
ac3ac98c59 Allow chat statuses to be translated.
Add conf setting for allowing OTR.
2013-09-08 16:39:46 +02:00
JC Brand
bc971ed853 Small update in translations section. Regenerated docs. 2013-09-03 12:38:54 +02:00
JC Brand
a092d6e440 Updates #47
Mention FR translations.
Make sure "... is typing" gets translated.
2013-09-03 12:30:56 +02:00
JC Brand
58e6451ab9 Mention FR 2013-09-02 12:35:14 +02:00
JC Brand
44cd3168c8 Add French translations, courtesy of @tdesvenain 2013-09-02 12:31:35 +02:00
JC Brand
3b62580ccd Don't use ids for the login form inputs 2013-09-02 11:48:09 +02:00
JC Brand
e2c97e389f Add allow_otr option (doesn't nothing yet) 2013-09-02 11:30:54 +02:00
JC Brand
a50e2d73e5 Various bugfixes after testing OTR converse2converse
Previously only tested pidgin2converse
2013-09-01 21:37:22 +02:00
JC Brand
08d25643f0 Bump otr.js version 2013-09-01 21:36:59 +02:00
JC Brand
2f7524f14f Only mention generation of key if it's actually happening. 2013-08-31 23:42:48 +02:00
JC Brand
4c1e0564f8 Nicer prompts for SMP authentication.
Off-the-record is now functional and mostly done. Updates #11
2013-08-31 23:20:07 +02:00
JC Brand
9add3e3d94 Add support for Socialist's Millionaire Protocol authentication 2013-08-31 22:30:34 +02:00
JC Brand
6d237d3f72 Let the toolbar dropdown drop up instead. 2013-08-31 22:28:06 +02:00
JC Brand
a18b28f953 Fix tests 2013-08-31 20:53:12 +02:00
JC Brand
942d262622 Implement a check that the user's password is still the same
before trusting the decrypted private key, otherwise generate a new one.
2013-08-31 20:44:43 +02:00