JC Brand
4870389321
Fix width
2013-08-24 17:13:59 +02:00
JC Brand
5ba42a5283
Fix width
2013-08-24 17:13:33 +02:00
JC Brand
6e93098442
Fix chatbox width bug.
2013-08-24 17:10:05 +02:00
JC Brand
7eaf47d37b
Fix chatbox width bug.
2013-08-24 17:09:40 +02:00
JC Brand
104f905641
Merge branch 'master' into otr
...
Conflicts:
docs/doctrees/index.doctree
docs/html/index.html
docs/html/searchindex.js
2013-08-24 16:34:07 +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
c7029d8771
Regenerated docs
2013-08-24 16:11:36 +02:00
JC Brand
7e854edb48
Make sure to show the submit button if connecting failed
2013-08-24 16:11:08 +02:00
JC Brand
810f5dec95
Merge branch 'sane-mockup'
...
Conflicts:
docs/html/searchindex.js
index.html
2013-08-24 15:44:58 +02:00
JC Brand
0a1a837391
Three more tests for pending contacts.
...
Trying to flesh out the bug where in certain instances the 'pending contacts'
header doesn't get removed after the last pending contact is removed.
2013-08-24 15:33:06 +02:00
JC Brand
8ef0e570c1
Travis build passed, woo!
2013-08-24 03:20:37 +02:00
JC Brand
476fae13eb
I think I found the reason for travis' complaining.
2013-08-24 03:14:36 +02:00
JC Brand
bc0e200cee
Fixed tests
2013-08-24 03:13:25 +02:00
JC Brand
4bc2b7227f
Fixed tests initialization (broken during recent refactor)
2013-08-24 03:10:06 +02:00
JC Brand
bde8913510
Mention i18n/locales setting
2013-08-24 03:09:57 +02:00
JC Brand
75b61fda6f
Allow only a whitelist of settings attrs to be overridden
...
Makes it more secure, since the enclosed converse object as access to
privileged data, we don't want people to inject code that could expose that.
2013-08-24 02:43:41 +02:00
JC Brand
502b922515
Only show the controlbox after attaching. Updates #41 .
2013-08-24 02:29:13 +02:00
JC Brand
f96c52a09a
Bugfix. Set the connection attr on converse. Updates #41
2013-08-24 02:20:00 +02:00
JC Brand
35d8f1d7e8
Use dev scripts with debug option
2013-08-24 02:16:26 +02:00
JC Brand
5551ff0127
When prebinding, attach automatically. Fixes #41
...
This requires that valid jid, rid, sid and bosh_service_url values be given (or
a valid connection object that was already attached).
Updated the docs to reflect these changes.
2013-08-23 00:51:32 +02:00
JC Brand
4253c9aeae
Restrict logging only to when debug=true.
2013-08-23 00:51:32 +02:00
JC Brand
3110cda38b
fix path to bower
2013-08-21 23:57:39 +02:00
JC Brand
b7ecf39982
Update docs to mention new way to minify. Fixes #39
2013-08-20 22:53:19 +02:00
JC Brand
c788041a0c
Merge branch 'sane-mockup' into otr
...
Conflicts:
docs/html/searchindex.js
index.html
2013-08-20 22:38:24 +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
2699c3ca70
Fix tests. removeRoom method doesn't exist anymore
2013-08-20 22:05:10 +02:00
JC Brand
016a810d1d
Fix tests. removeRoom method doesn't exist anymore
2013-08-20 22:05:00 +02:00
JC Brand
304b275714
Fix tests. removeRoom method doesn't exist anymore
2013-08-20 22:03:46 +02:00
JC Brand
2896ae2ce4
Regenerated sphinx docs
2013-08-16 16:17:27 +02:00
JC Brand
cf4cec1e29
Refactored sendMessage
...
Let the message only be sent when an event has been triggered.
This allows us to first (if necessary) let OTR process the image.
2013-08-16 16:05:24 +02:00
JC Brand
a2aeec8449
Add initial OTR code.
...
- /otr will generate a new private key (or fetch it from storage).
2013-08-16 15:48:23 +02:00
JC Brand
57fc8b9832
Merge branch 'master' into otr
...
Conflicts:
docs/html/_static/stylesheet.css
docs/html/searchindex.js
2013-08-16 11:28:34 +02:00
JC Brand
fc4bec1e9c
Regenerated docs
2013-08-16 11:27:29 +02:00
JC Brand
cac9d9c55e
Mention debug option in docs
2013-08-16 11:25:58 +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
72d0f566fc
Merge branch 'master' into mockup
2013-08-15 20:47:50 +02:00
JC Brand
cf161a729a
Add contacts regardless of how getVCard failed
2013-08-15 20:47:19 +02:00
JC Brand
66b92fedcb
Add debug option explicitly
2013-08-15 20:43:39 +02:00
JC Brand
c43c34013b
Add font icon required changes for chatrooms.
2013-08-15 20:36:06 +02:00
JC Brand
414553ef57
Better icon class name
2013-08-15 20:35:44 +02:00
JC Brand
f846e70c10
Merge branch 'master' into mockup
2013-08-15 20:34:04 +02:00
JC Brand
7e0f538029
Bugfix. removeRoom doesn't exist anymore
2013-08-15 20:33:42 +02:00
JC Brand
15ed513345
Start making the markup changes required for the font icons
2013-08-15 20:14:00 +02:00
JC Brand
1036fc12d9
Put icon inside link
2013-08-15 20:13:50 +02:00
JC Brand
359dbc68f7
Merge branch 'master' into mockup
2013-08-15 19:36:46 +02:00
JC Brand
a9c1978804
Rename icon classes to match chat states
2013-08-15 19:36:19 +02:00
JC Brand
44d094f56f
Add a debug option (logs to browser console)
2013-08-15 19:34:40 +02:00
