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
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
JC Brand
dfe76e42f0
Merge branch 'master' into mockup
...
Conflicts:
converse.css
mockup.html
2013-08-25 13:03:56 +02:00
JC Brand
6aa1e97f21
Extend the mockup and fixed two CSS bugs.
...
Test for very long words in chat messages (must be wrapped) and very long names
in chatroom participants list.
Also show chat-info and chat-event messages (could probably be merged into one
class/style).
2013-08-25 12:49:21 +02:00
JC Brand
7fcec77651
Explicitly set chatbox width
2013-08-24 21:36:36 +02:00
JC Brand
4870389321
Fix width
2013-08-24 17:13:59 +02:00
JC Brand
6e93098442
Fix chatbox width bug.
2013-08-24 17:10:05 +02:00
JC Brand
0157b2379a
Remove explicit borders around chatboxes.
...
Conflicts:
converse.css
2013-08-20 22:36:44 +02:00
JC Brand
9ba32930c0
Remove explicit borders around chatboxes.
2013-08-20 22:33:51 +02:00
JC Brand
ed7905d10e
Padding tweaks
2013-08-16 11:20:19 +02:00
JC Brand
fadae7a453
Restyle chat toolbar and add more icons
2013-08-15 22:50:13 +02:00
JC Brand
74cc8ceead
Add two toolbar buttons for the send message textarea
2013-08-15 21:22:14 +02:00
JC Brand
1036fc12d9
Put icon inside link
2013-08-15 20:13:50 +02:00
JC Brand
c32f4bb171
Replace fonticons. Tweaked offline and busy fonts
2013-08-15 18:30:12 +02:00
JC Brand
b79c12e8a1
Mockup tweaks
2013-08-12 22:10:01 +02:00
JC Brand
84f4e47127
More tweaks and fixes
2013-08-12 21:32:00 +02:00
JC Brand
62534bf73d
mockup: configure close and configure buttons
2013-08-12 21:07:35 +02:00
JC Brand
f23e480baf
Remove more images with fonticons
2013-08-12 20:52:30 +02:00
JC Brand
4e606b3510
Mockup: add chatroom with error, fix box heights.
2013-08-12 20:10:12 +02:00
JC Brand
e2c11bf19f
More mockup work.
...
- Added requesting contacts.
- Fix contact width on hover.
- Add tooltips for status icons
2013-08-12 19:22:43 +02:00
JC Brand
39665516a1
Darker font colors
2013-08-10 09:04:13 +02:00
JC Brand
e01dc0398d
Give proper names and tweak font colors
2013-08-09 23:30:59 +02:00
JC Brand
cb5a75d310
Tweak contact status fonticon
2013-08-09 23:20:50 +02:00
JC Brand
396e54c0a7
fixed markup for 'add a contact'
2013-08-09 23:16:46 +02:00
JC Brand
861887fd77
Initial markup, testing out font icons
2013-08-09 20:25:21 +02:00
JC Brand
f8183c134e
Add copyright header
2013-07-30 21:42:42 +02:00
JC Brand
527c96afd1
Make sure the info icon doesn't get cut off.
2013-07-27 01:07:26 +02:00
JC Brand
4c0d4f2ac5
bugfix. Fixes #26 . Only the first minute digit was shown.
2013-07-24 22:58:53 +02:00
JC Brand
7a94f73d9f
Fixed alignment of chat messages in Firefox
2013-05-31 16:53:43 +02:00
JC Brand
c845d11f26
Make sure chat-info msgs are not auto-removed
2013-05-31 09:58:12 +02:00
JC Brand
b0f0eb2bc8
.chat-body should have top rounded corners
2013-05-30 20:40:24 +02:00
JC Brand
b97e23ea0d
CSS fixes for overflowing text.
2013-05-26 21:43:57 +02:00
