Commits · 17a05ce80165c4648460754818b14322ca47ecbe · nexedi / converse.js

17 Mar, 2014 1 commit
- Use fork of strophe.js which includes already built file. · 17a05ce8
  JC Brand authored Mar 17, 2014
```
Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.
```
  17a05ce8
15 Mar, 2014 3 commits
- 2 controlbox bugfixes and spec typo. · 3cfcb2ae
  JC Brand authored Mar 14, 2014
```
* Save controlbox to containing collection
* Call refreshWebkit after closing controlbox
```
  3cfcb2ae
- Delete icon must appear on same line as pending contact · 7e0bb8b1
  JC Brand authored Mar 09, 2014
  
  7e0bb8b1
- Bugfix: undefined template and a typo · fae9b845
  JC Brand authored Mar 09, 2014
  
  fae9b845
14 Mar, 2014 3 commits
- Add toggle test for chatrooms · 6290f954
  JC Brand authored Mar 14, 2014
  
  6290f954
- Add MakeFile target for setting up dev env. · b552b885
  JC Brand authored Mar 14, 2014
  
  b552b885
- Use my fork of requirejs-tpl since jfparadis isn't merging my changes · ad4d959d
  JC Brand authored Mar 14, 2014
  
  ad4d959d
09 Mar, 2014 4 commits
- Show "refresh" instead of "start" when already encrypted. · 909f7850
  JC Brand authored Mar 09, 2014
  
  909f7850
- Add a counter to show unread msgs when chat is minimized · bb0f49cf
  JC Brand authored Mar 09, 2014
  
  bb0f49cf
- Merge branch 'master' into 0.8 · 9849daac
  JC Brand authored Mar 09, 2014
```
Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js
```
  9849daac
- Add another URL test with double quotes. · 8001444a
  JC Brand authored Mar 09, 2014
  
  8001444a
05 Mar, 2014 5 commits
- Two more typos · 77e6c0a4
  JC Brand authored Mar 05, 2014
  
  77e6c0a4
- Fix release version typo · 5e8b6185
  JC Brand authored Mar 05, 2014
  
  5e8b6185
- Release version 0.7.4 · 9b3af57d
  JC Brand authored Mar 05, 2014
  
  9b3af57d
- Ensure that URLs in messages are properly escaped · 74779afd
  JC Brand authored Mar 05, 2014
  
  74779afd
- Add (currently still disabled) test for... · 34fa0588
  JC Brand authored Mar 05, 2014
```
message counter for minimized chats
```
  34fa0588
04 Mar, 2014 10 commits
- Refactor message handling · 25cc2290
  JC Brand authored Mar 05, 2014
```
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity

Conflicts:
	converse.js
	tests/utils.js
```
  25cc2290
- Refactor message handling · 317ab95c
  JC Brand authored Mar 05, 2014
```
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity
```
  317ab95c
- Properly define the crypto dependencies. Fixes #125 · c38e4f1c
  JC Brand authored Mar 04, 2014
  
  c38e4f1c
- Properly define the crypto dependencies. Fixes #125 · 2094ca12
  JC Brand authored Mar 04, 2014
  
  2094ca12
- Add a test for chatbox toggling. · c2b7caae
  JC Brand authored Mar 04, 2014
  
  c2b7caae
- Emit new event onChatBoxToggled · ec39e6e8
  JC Brand authored Mar 04, 2014
  
  ec39e6e8
- Rename ChatBoxesView to ChatBoxViews · b14538b4
  JC Brand authored Mar 04, 2014
  
  b14538b4
- Add closure get/set methods for rosteritem views · 1567b212
  JC Brand authored Mar 04, 2014
  
  1567b212
- Add closured get/set methods for views from chatboxesview · d20ca106
  JC Brand authored Mar 04, 2014
  
  d20ca106
- Extend the "close chat" test with a normal chatbox usecase · ac0042fd
  JC Brand authored Mar 04, 2014
  
  ac0042fd
01 Mar, 2014 1 commit
- Fix tests and simplify code for showing controlbox · c030494e
  JC Brand authored Mar 01, 2014
  
  c030494e
28 Feb, 2014 8 commits
- Simplified by setting height via template, not JS · 4f2125c2
  JC Brand authored Mar 01, 2014
```
Also dropped the minimum height restriction
```
  4f2125c2
- Add new mockup specifically for minimized chats · 891f291c
  JC Brand authored Feb 28, 2014
  
  891f291c
- Give the controlbox toggle same margin as chat boxes. · 6a421af9
  JC Brand authored Feb 28, 2014
```
... and remove dragresize stuff from the mockup
```
  6a421af9
- Save chat box's toggle state between page loads. · 7d58d856
  JC Brand authored Feb 28, 2014
  
  7d58d856
- Store and maintain a chatbox's custom size. · 8294162f
  JC Brand authored Feb 28, 2014
  
  8294162f
- Fix tests after all the refactoring... · 11b59b31
  JC Brand authored Feb 28, 2014
  
  11b59b31
- use new CryptoJS repo since the old one was removed. · b9cf7950
  JC Brand authored Feb 28, 2014
```
Conflicts:
	bower.json
	tests_main.js
```
  b9cf7950
- use new CryptoJS repo since the old one was removed. · 085234f9
  JC Brand authored Feb 28, 2014
  
  085234f9
23 Feb, 2014 3 commits
- Fix webkit bug that prevents boxes from reordering when one is closed · 8feeb733
  JC Brand authored Feb 23, 2014
  
  8feeb733
- Add some resistance around chatbox's original height when resizing · 0414fa02
  JC Brand authored Feb 23, 2014
  
  0414fa02
- Merge remote-tracking branch 'origin' into 0.8 · 1ce7620b
  JC Brand authored Feb 23, 2014
```
Conflicts:
	converse.js
	docs/CHANGES.rst
	index.html
```
  1ce7620b
22 Feb, 2014 2 commits
- Fix BOSH url · 839dd0bd
  JC Brand authored Feb 23, 2014
  
  839dd0bd
- Get ready to release 0.7.3 of converse.js · 0cffd78f
  JC Brand authored Feb 23, 2014
  
  0cffd78f