Commit Graph

1647 Commits

Author SHA1 Message Date
JC Brand
d2358a6a93 Controlbox and its toggle are now mutually exclusive.
When the one is visible, the other is hidden and vice versa.
2014-01-22 23:19:45 +02:00
JC Brand
0bc40eed25 Start updating the templates with the new markup 2014-01-22 20:44:47 +02:00
JC Brand
823f93f006 Merge branch 'templates' into 0.8
Conflicts:
	converse.js
2014-01-22 19:29:47 +02:00
JC Brand
f2c354b7d9 Set a class 'minimized' instead of hardcoding style 2014-01-22 19:27:15 +02:00
JC Brand
b189e6dfcb Fix minimize which broke again after previous CSS changes 2014-01-22 17:45:16 +02:00
JC Brand
7600018ff1 Style the controlbox toggle. 2014-01-22 17:29:14 +02:00
JC Brand
cf22003a97 Regenerated Pot file. 2014-01-22 17:07:50 +02:00
JC Brand
ee6c6102fb CSS changes, see below:
- Rename some classes to make clearer.
- Fixed resizing of chat rooms.
- Changed controlbox so that only contacts are scrollable
2014-01-22 16:01:49 +02:00
JC Brand
46838fb2f9 Some refinements around chatroom css and dragresize 2014-01-22 15:34:26 +02:00
JC Brand
ea62e2f3e0 Remove the #controlbox-panes element. Not needed. 2014-01-22 15:16:00 +02:00
JC Brand
3eaeed4ce9 Two more css width fixes. 2014-01-20 16:16:41 +02:00
JC Brand
7991a0196a CSS tweaks to fix issues with variable height...
due to new ability to resize chat boxes.
2014-01-20 16:10:22 +02:00
JC Brand
e2e2a80a2d Add the dragresize code to the static mockup and tweak it a bit
Removed unused css and html files.
2014-01-19 13:37:26 +02:00
JC Brand
c46b5cc7cc Cleaned up via JSLint 2014-01-19 13:04:58 +02:00
JC Brand
296c6e605f Initial work on merging mockup markup into the dragresize mockup 2014-01-19 11:43:35 +02:00
JC Brand
c3a513a15c Merge branch 'dragresize' into minimize2
Conflicts:
	converse.css
	converse.js
	mockup.html
2014-01-19 11:33:15 +02:00
JC Brand
18cacdc94b More templates refactored into separate files. 2014-01-19 11:22:56 +02:00
JC Brand
4e9dc08b0b Clean up after running tests, by closing chatboxes. 2014-01-19 07:02:18 +02:00
JC Brand
feb81a02f3 Move more templates out into separate files. 2014-01-19 06:37:55 +02:00
JC Brand
46883344b6 Fix minimize for chatrooms 2014-01-17 17:20:55 +02:00
JC Brand
70bfd5712e Fix width issue when minimized. Add more chatboxes to mockup 2014-01-17 17:12:39 +02:00
JC Brand
f3ca08f165 Simplified the markup a bit.
Also, added another chatbox and fixed reflow after closing a chatbox.
2014-01-17 04:22:57 +02:00
JC Brand
69159fd732 Add initial support for minimizing chatboxes 2014-01-16 15:57:14 +02:00
JC Brand
ae10412841 Update text since we don't serve via Github anymore 2014-01-15 02:19:54 +02:00
JC Brand
5d42e90d95 Fix typo 2014-01-15 02:06:08 +02:00
JC Brand
8161ad9b54 Add references to the Wordpress plugin by @thomascamaran 2014-01-15 02:03:14 +02:00
JC Brand
7f8c85f10a Integrate Japanese translations 2014-01-08 15:44:13 +02:00
JC Brand
ec0d7e0527 Merge pull request #108 from mako09/translate-ja
add Japanese po
2014-01-08 05:37:39 -08:00
Mako N
17f4c64948 add Japanese po 2014-01-07 11:35:10 +09:00
JC Brand
1323c0fccf Merge pull request #103 from Aupajo/call-button
Option to enable toolbar call button
2013-12-31 17:21:53 -08:00
JC Brand
55b9a4e568 Initial support for external HTMl templates. Updates #77 2013-12-31 01:07:11 +02:00
JC Brand
f97217cfd7 Add requirejs-text 2013-12-30 13:02:37 +02:00
Pete Nicholls
0b4fe330d6 Document show_call_button option 2013-12-26 15:02:28 +13:00
Pete Nicholls
1d3aa9f450 Add model to onCallButtonClicked event payload 2013-12-26 14:48:48 +13:00
Pete Nicholls
410b80c326 Style call button to match toolbar button colour 2013-12-19 12:26:21 +13:00
Pete Nicholls
6002e0fdf9 Use converse.emit to dispatch call button event 2013-12-19 12:26:11 +13:00
Pete Nicholls
db60894834 Add optional call button to chat box toolbar 2013-12-19 12:26:07 +13:00
Pete Nicholls
201004f815 Order options alphabetically 2013-12-19 12:02:57 +13:00
Pete Nicholls
fd918a5243 Support using OTR by default 2013-12-19 12:02:50 +13:00
JC Brand
e3e8bf6c69 New release 0.7.2 2013-12-18 17:07:11 +02:00
JC Brand
478653aebd Bugfix. Wrong number of online contacts shown. Fixes #97 2013-12-18 16:48:02 +02:00
JC Brand
4186bf3ca3 Throw event onRosterViewUpdated whenever the roster HTML changes. Fixes #101 2013-12-18 16:30:19 +02:00
JC Brand
8633d23738 Sanitize text messages to disable Javascript injection attacks.
Thanks to hejsan.
2013-12-18 13:51:59 +02:00
JC Brand
cbde2a1d49 Make the fetching of VCards optional. Updates #100 2013-12-17 19:24:36 +02:00
JC Brand
7b2d16afbc Bugfix. The 'get' function complains when there's no callback 2013-12-17 18:51:47 +02:00
JC Brand
c8bf0491c8 Add new spec to test converse.js's API. Fixes #48 2013-12-16 20:00:21 +02:00
JC Brand
326e5a188b Rename the spec files 2013-12-16 20:00:15 +02:00
JC Brand
d1bf5b8466 Add event emitter tests for chatrooms. Updates #48 2013-12-16 19:19:25 +02:00
JC Brand
603087c34b Refined events emitting docs. 2013-12-16 15:27:33 +02:00
JC Brand
cdc350f592 Add more tests for events emitting. Updates #48 2013-12-16 15:27:07 +02:00