Commit Graph

1142 Commits

Author SHA1 Message Date
JC Brand
e530094acc Update roster snippet to be same as mockup. 2013-08-27 11:19:18 +02:00
JC Brand
a2c70b47d8 Bugfix. factory isn't defined. 2013-08-27 10:19:14 +02:00
JC Brand
b61c936790 Don't reference LC_MESSAGES/en Bungle doesn't seem to find it. 2013-08-27 09:59:14 +02:00
JC Brand
563987cf29 Include Jed for the nolocales option.
We need variable sprintf type var interpolation
2013-08-27 09:37:33 +02:00
JC Brand
661199dd16 Add chatroom topic 2013-08-27 09:36:55 +02:00
JC Brand
5682473426 Whitelist jid, sid and rid as well. 2013-08-26 16:40:34 +02:00
JC Brand
832c2eae90 Regenerated POT file. 2013-08-26 16:21:47 +02:00
JC Brand
9628189382 Can't call i18n.translate directly if we bundle without i18n support 2013-08-26 16:21:32 +02:00
JC Brand
1d6f2dbe5a Bugfix. i18n is attr, not variable. 2013-08-26 15:05:08 +02:00
JC Brand
d4502d6e6f As with localstorage, give tinysort it's full name
(Aids with bungle integration)
2013-08-26 14:45:24 +02:00
JC Brand
7b0e1d331b Working on a way to build converse without locales.
- Add nolocales.js and let the __ function handle case where there aren't any
  locales specified.

Also:
In require config, change localstorage to backbone.localStorage (for better
integration with bungle).
2013-08-26 14:37:35 +02:00
JC Brand
ef1a57c6d0 Bugfix. Pencil icon not visible (for setting status update). 2013-08-26 10:54:58 +02:00
JC Brand
a54bb784ee Update changes and reminify 2013-08-26 09:40:53 +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
4ae20ee1b7 Set release date 2013-08-25 23:42:49 +02:00
JC Brand
464d42cf62 Updated docs with info on almond build. 2013-08-25 23:41:04 +02:00
JC Brand
0fefc55ae1 Update CHANGES.txt. 2013-08-25 23:34:35 +02:00
JC Brand
d766a9f495 Re-minified files. The JS now uses almond and not require.js 2013-08-25 23:29:49 +02:00
JC Brand
eab812daca Doesn't work with the almond minified file.
Can add it back later and fix.
2013-08-25 23:27:41 +02:00
JC Brand
2c0ae11fb7 Remove sjcl, which is not being used anymore 2013-08-25 23:27:07 +02:00
JC Brand
7d648f9611 Re-add build.js so that we can build with almond.
grunt-contribute-requirejs doesn't support almond (yet?).
2013-08-25 23:25:13 +02:00
JC Brand
c389c0f77d Allow the use of hyphens for country codes. 2013-08-25 22:45:41 +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
887d27ae59 Merge branch 'mockup' into otr 2013-08-25 14:32:36 +02:00
JC Brand
6313b6c0ee Merge branch 'master' into otr 2013-08-25 14:32:28 +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
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