Commit Graph

1250 Commits

Author SHA1 Message Date
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
JC Brand
3fbf572ac6 Bugfix. Plaintext msgs sent after OTR termination weren't saved 2013-08-31 17:43:38 +02:00
JC Brand
8e8987a877 Added a way to verify your buddies identity
(by enabling fingerprint comparisons)
2013-08-31 17:27:14 +02:00
JC Brand
7a31d8cae2 User can now end an encrypted session. 2013-08-31 16:06:47 +02:00
JC Brand
6ac24c3b31 Show many more info messages to inform user of OTR status 2013-08-31 15:45:23 +02:00
JC Brand
e8976dc448 More UI improvements.
Don't show encrypted messages when we don't have an encrypted session set up on
our side (show error message instead).
2013-08-31 15:00:04 +02:00
JC Brand
67266b2df4 Experimenting with making the chatboxes resizable. 2013-08-31 14:31:21 +02:00
JC Brand
9777406489 Use class instead of id for controlbox-panes element 2013-08-31 14:31:11 +02:00
JC Brand
f0204dd54b Use class instead of id for controlbox-panes element 2013-08-31 14:29:58 +02:00
JC Brand
fcd488c452 Improved UI. The chat toolbar now gives better feedback. 2013-08-30 22:49:33 +02:00
JC Brand
ccfccfb2cf Handle case where buddy starts OTR better. 2013-08-30 21:18:46 +02:00
JC Brand
48b6898a2e Merge branch 'master' into otr
Conflicts:
	main.js
2013-08-30 21:18:29 +02:00
JC Brand
d5df785a2a tinysort's name changed so this dependency wasn't registered. 2013-08-30 20:49:49 +02:00
JC Brand
e4cf875d24 Merge branch 'master' into otr
Conflicts:
	bower.json
	converse.css
	converse.js
	main.js
	tests_main.js
2013-08-30 20:26:48 +02:00
JC Brand
c61eef994c CSS tweaks from collective.xmpp.chat 2013-08-30 20:22:37 +02:00
JC Brand
fde8bb3500 New minified files. Bump version to 0.6.1 2013-08-30 00:00:34 +02:00
JC Brand
42c3bc2b38 Bugfix.
With auto_subscribe=True, "Pending Contacts" header didn't disappear
after user was added to the roster.
2013-08-29 21:56:56 +02:00
JC Brand
9463778185 Some optimization changes.
Don't sort roster contacts needlessly.
Don't call show() or hide() needlessly.
No need for setting a 'sorted' attr on the last item.
2013-08-29 21:24:47 +02:00