Commits · d402ed8e8ee0615a6c3d70397944a6e2c5d21905 · nexedi / converse.js

12 Sep, 2013 12 commits
- Merge branch 'master' into otr · d402ed8e
  JC Brand authored Sep 12, 2013
```
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
```
  d402ed8e
- Correct version is 0.6.3 · 84915290
  JC Brand authored Sep 12, 2013
  
  84915290
- Merge branch 'master' of github.com:jcbrand/converse.js · 8b5287dc
  JC Brand authored Sep 12, 2013
  
  8b5287dc
- Bump version and minimize files. · 008bac4f
  JC Brand authored Sep 12, 2013
  
  008bac4f
- Bump version and minimize files. · d4375029
  JC Brand authored Sep 12, 2013
  
  d4375029
- Bump version everywhere and regenerate docs. · 68a99093
  JC Brand authored Sep 12, 2013
  
  68a99093
- For uniqueness, we need both JIDs for messages localStorage Fixes #49 · 37f3a95a
  JC Brand authored Sep 12, 2013
  
  37f3a95a
- Bugfix. Messages were stored against buddy JID and not own JID · 4ab6f281
  JC Brand authored Sep 12, 2013
  
  4ab6f281
- Merge new translations into the PO files · a33e370c
  JC Brand authored Sep 12, 2013
  
  a33e370c
- Regenerated docs · 6c84f1e9
  JC Brand authored Sep 12, 2013
  
  6c84f1e9
- Add new Makefile step "merge" and document it. · 0ef6a727
  JC Brand authored Sep 12, 2013
  
  0ef6a727
- The word 'me' wasn't translation aware. · 9734ccde
  JC Brand authored Sep 10, 2013
```
Conflicts:
	locale/converse.pot
```
  9734ccde
10 Sep, 2013 6 commits
- Merge branch 'master' into otr · 00cb015d
  JC Brand authored Sep 10, 2013
```
Conflicts:
	converse.js
```
  00cb015d
- The word 'me' wasn't translation aware. · 778b8a7c
  JC Brand authored Sep 10, 2013
  
  778b8a7c
- Update af translations · cf6c1e21
  JC Brand authored Sep 10, 2013
  
  cf6c1e21
- Translated strings may not be broken up. Regenerated POT file · 4bb22b5c
  JC Brand authored Sep 10, 2013
  
  4bb22b5c
- Don't change color when hovering over .toggle-otr · 1d44c60b
  JC Brand authored Sep 10, 2013
  
  1d44c60b
- Save the private key and instance tag in session storage. · 1574acb3
  JC Brand authored Sep 10, 2013
  
  1574acb3
08 Sep, 2013 3 commits
- Show an alert before generating private key · 9967b955
  JC Brand authored Sep 08, 2013
```
To make it clear to the user that the browser might freeze up while generating
the key.
```
  9967b955
- Add option to hide the toolbar · 36c2a2ac
  JC Brand authored Sep 08, 2013
  
  36c2a2ac
- Allow chat statuses to be translated. · ac3ac98c
  JC Brand authored Sep 08, 2013
```
Add conf setting for allowing OTR.
```
  ac3ac98c
03 Sep, 2013 2 commits
- Small update in translations section. Regenerated docs. · bc971ed8
  JC Brand authored Sep 03, 2013
  
  bc971ed8
- Updates #47 · a092d6e4
  JC Brand authored Sep 03, 2013
```
Mention FR translations.
Make sure "... is typing" gets translated.
```
  a092d6e4
02 Sep, 2013 4 commits
- Mention FR · 58e6451a
  JC Brand authored Sep 02, 2013
  
  58e6451a
- Add French translations, courtesy of @tdesvenain · 44cd3168
  JC Brand authored Sep 02, 2013
  
  44cd3168
- Don't use ids for the login form inputs · 3b62580c
  JC Brand authored Sep 02, 2013
  
  3b62580c
- Add allow_otr option (doesn't nothing yet) · e2c97e38
  JC Brand authored Sep 02, 2013
  
  e2c97e38
01 Sep, 2013 2 commits
- Various bugfixes after testing OTR converse2converse · a50e2d73
  JC Brand authored Sep 01, 2013
```
Previously only tested pidgin2converse
```
  a50e2d73
- Bump otr.js version · 08d25643
  JC Brand authored Sep 01, 2013
  
  08d25643
31 Aug, 2013 11 commits
- Only mention generation of key if it's actually happening. · 2f7524f1
  JC Brand authored Aug 31, 2013
  
  2f7524f1
- Nicer prompts for SMP authentication. · 4c1e0564
  JC Brand authored Aug 31, 2013
```
Off-the-record is now functional and mostly done. Updates #11
```
  4c1e0564
- Add support for Socialist's Millionaire Protocol authentication · 9add3e3d
  JC Brand authored Aug 31, 2013
  
  9add3e3d
- Let the toolbar dropdown drop up instead. · 6d237d3f
  JC Brand authored Aug 31, 2013
  
  6d237d3f
- Fix tests · a18b28f9
  JC Brand authored Aug 31, 2013
  
  a18b28f9
- Implement a check that the user's password is still the same · 942d2626
  JC Brand authored Aug 31, 2013
```
before trusting the decrypted private key, otherwise generate a new one.
```
  942d2626
- Bugfix. Plaintext msgs sent after OTR termination weren't saved · 3fbf572a
  JC Brand authored Aug 31, 2013
  
  3fbf572a
- Added a way to verify your buddies identity · 8e8987a8
  JC Brand authored Aug 31, 2013
```
(by enabling fingerprint comparisons)
```
  8e8987a8
- User can now end an encrypted session. · 7a31d8ca
  JC Brand authored Aug 31, 2013
  
  7a31d8ca
- Show many more info messages to inform user of OTR status · 6ac24c3b
  JC Brand authored Aug 31, 2013
  
  6ac24c3b
- More UI improvements. · e8976dc4
  JC Brand authored Aug 31, 2013
```
Don't show encrypted messages when we don't have an encrypted session set up on
our side (show error message instead).
```
  e8976dc4