Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
26
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
1,511 Commits 2 Branches 109 Tags 304 MiB
37255a2692
Commit Graph

1511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f4eeb50438 Update CHANGES.rst and newest version number 2013-08-25 12:58:07 +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
7f3c507aa8 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:48:24 +02:00
JC Brand
a95634fb26 Add crypto.aes to tests_main 2013-08-25 12:20:26 +02:00
JC Brand
921ae7ec7e More renamings/refactoring to add consistency 2013-08-25 12:17:46 +02:00
JC Brand
6a45eee6da Rename methods to trying and get some consistency. 2013-08-25 12:06:53 +02:00
JC Brand
044fb84c3a More work on Off-the-record support. Updates #11 
OTR key exchange now works and encrypted messages can be sent.
Lots of rough edges however and no proper UI.
 2013-08-24 23:11:22 +02:00
JC Brand
7fcec77651 Explicitly set chatbox width 2013-08-24 21:36:36 +02:00
JC Brand
75ea03875a Explicitly set chatbox width 2013-08-24 21:36:07 +02:00
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