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
90be11aee8
New release: 0.6.5.
...
Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
2013-10-08 09:11:04 +02:00
JC Brand
1d44c60ba7
Don't change color when hovering over .toggle-otr
2013-09-10 22:42:05 +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
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
fd47d5ecb6
Add custom status form to the mockup.
2013-08-27 22:24:25 +02:00
JC Brand
661199dd16
Add chatroom topic
2013-08-27 09:36:55 +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
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
6e93098442
Fix chatbox width bug.
2013-08-24 17:10:05 +02:00
JC Brand
2890a045e0
Expand the mockup a bit. Add canvas element, more msgs etc.
2013-08-24 16:28:59 +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
414553ef57
Better icon class name
2013-08-15 20:35:44 +02:00
JC Brand
1036fc12d9
Put icon inside link
2013-08-15 20:13:50 +02:00
JC Brand
a9c1978804
Rename icon classes to match chat states
2013-08-15 19:36:19 +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
3e16256a71
More work on the mockup. Add js to switch tabs
2013-08-11 14:38:40 +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
396e54c0a7
fixed markup for 'add a contact'
2013-08-09 23:16:46 +02:00
JC Brand
b1f32df9b6
Add mockup.html
2013-08-09 20:26:30 +02:00
