JC Brand
1ce7620b88
Merge remote-tracking branch 'origin' into 0.8
...
Conflicts:
converse.js
docs/CHANGES.rst
index.html
2014-02-23 02:54:35 +02:00
JC Brand
d0f1a6cfb9
Simplify spinner css
2014-02-12 01:41:24 +02:00
JC Brand
5406df1bc7
Add an animated spinner when generating a private key.
2014-01-31 13:40:33 +02:00
JC Brand
12fc286ca6
Various changes, see below:
...
- disable drag resizing when chatboxes are minimized.
- refactored chat box and chat room markup so that they are more similar.
- don't make the chat box title clickable if no vcard URL is available
- make only the title text clickable, not the whitespace
- fixed toggling of resized chats
2014-01-27 02:26:55 +02:00
JC Brand
62f6997a25
Chat boxes and rooms can now be resized vertically
...
The new size is not stored/persisted.
2014-01-23 00:55:52 +02:00
JC Brand
d0af974206
Chat boxes can now be minimized. Updates #71
2014-01-22 23:51:15 +02:00
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
f2c354b7d9
Set a class 'minimized' instead of hardcoding style
2014-01-22 19:27:15 +02:00
JC Brand
7600018ff1
Style the controlbox toggle.
2014-01-22 17:29:14 +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
c3a513a15c
Merge branch 'dragresize' into minimize2
...
Conflicts:
converse.css
converse.js
mockup.html
2014-01-19 11:33:15 +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
Pete Nicholls
410b80c326
Style call button to match toolbar button colour
2013-12-19 12:26:21 +13:00
JC Brand
f030e2bafb
Move contents of style.css into converse.css
2013-10-27 22:29:27 +02:00
JC Brand
38c26013d0
Simplify the boilerplate HTML require even more.
...
Use id 'conversejs' instead of 'chatpanel'.
The controlbox toggle is now generated via a backbone view, you don't need to
manually include it in your markup.
2013-10-20 22:42:34 +02:00
JC Brand
25dc4a27e2
Add smiley support for chatrooms as well
2013-10-20 18:13:34 +02:00
JC Brand
a5daeb017e
Emoticons now supported for single-user chat.
2013-10-19 23:18:17 +02:00
JC Brand
0204bdec1b
Some minor CSS tweaks and pixel pushing
2013-10-17 20:30:07 +02:00
JC Brand
bb1f9955c9
Add smileys and minimize buttons to the mockup
2013-10-16 22:27:53 +02:00
JC Brand
b6a6562de9
Merge branch '0.6.x'
...
Conflicts:
Makefile
converse.css
converse.min.css
converse.min.js
docs/doctrees/index.doctree
docs/html/index.html
docs/html/searchindex.js
2013-10-08 22:12:12 +02:00
JC Brand
a01d510249
Proper truncating (with ellipsis) of chatroom names
2013-10-08 09:09:17 +02:00
JC Brand
e4c9fcbc4e
Merge branch '0.6.x'
...
Conflicts:
converse.css
converse.js
index.html
Add allow_muc config option
2013-10-03 13:53:47 +02:00
JC Brand
7f4bdb4098
Don't use id for controlbox panes
2013-10-03 13:45:50 +02:00
Sergio Oliveira
0bf807fd94
Avoiding clash with bootstrap
...
Using #chatpanel in front of every css class to avoid css name clashing
with bootstrap and other css frameworks
2013-09-19 13:05:29 -03:00
JC Brand
1d44c60ba7
Don't change color when hovering over .toggle-otr
2013-09-10 22:42:05 +02:00
JC Brand
6d237d3f72
Let the toolbar dropdown drop up instead.
2013-08-31 22:28:06 +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
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
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
c5e44a02fa
Bugfix. The remove icon wasn't being shown for contacts.
2013-08-29 20:06:17 +02:00
JC Brand
f3c45e18af
Give click/indent effect to config button as well.
2013-08-26 09:38:53 +02:00
JC Brand
c0a4e9577c
IE8 fixes.
2013-08-26 09:33:11 +02:00
JC Brand
a0d5941fdb
Another IE8 fix.
2013-08-26 09:30:00 +02:00
JC Brand
a607e09eef
Better textarea styling. Ensure all boxes are same height.
...
Conflicts:
converse.css
2013-08-26 09:29:14 +02:00
JC Brand
b2d4205baa
IE8 CSS fix.
2013-08-26 09:13:12 +02:00
JC Brand
664e2090ba
Add initial UI and handlers for starting OTR to converse.js
2013-08-25 22:10:32 +02:00
JC Brand
76da418380
Add a dropdown menu for OTR
2013-08-25 21:42:24 +02:00
JC Brand
40a3e013fd
Style toolbar for OTR support
2013-08-25 14:30:59 +02:00
JC Brand
9c88aa1929
Better textarea styling. Ensure all boxes are same height.
2013-08-25 13:50:55 +02:00
