Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
860 Commits 2 Branches 109 Tags 304 MiB
9777406489
Commit Graph

860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
9777406489 Use class instead of id for controlbox-panes element 2013-08-31 14:31:11 +02:00
JC Brand
fcd488c452 Improved UI. The chat toolbar now gives better feedback. 2013-08-30 22:49:33 +02:00
JC Brand
ccfccfb2cf Handle case where buddy starts OTR better. 2013-08-30 21:18:46 +02:00
JC Brand
48b6898a2e Merge branch 'master' into otr 
Conflicts:
	main.js
 2013-08-30 21:18:29 +02:00
JC Brand
d5df785a2a tinysort's name changed so this dependency wasn't registered. 2013-08-30 20:49:49 +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
fde8bb3500 New minified files. Bump version to 0.6.1 2013-08-30 00:00:34 +02:00
JC Brand
42c3bc2b38 Bugfix. 
With auto_subscribe=True, "Pending Contacts" header didn't disappear
after user was added to the roster.
 2013-08-29 21:56:56 +02:00
JC Brand
9463778185 Some optimization changes. 
Don't sort roster contacts needlessly.
Don't call show() or hide() needlessly.
No need for setting a 'sorted' attr on the last item.
 2013-08-29 21:24:47 +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
5cb74239c3 Update security info 2013-08-29 15:07:14 +02:00
JC Brand
202483130d Bump version number for release. 2013-08-28 00:47:35 +02:00
JC Brand
1430689c43 Bugfix. Fall back to 'en' if non-existing locale was specified. 2013-08-28 00:47:14 +02:00
JC Brand
adfe473b40 Reminify Javascript 2013-08-28 00:30:22 +02:00
JC Brand
79be6ea693 Add section about integration into other frameworks 
Also expand on the security question.
 2013-08-28 00:26:52 +02:00
JC Brand
fd187533fd Add special option xhr_custom_status. 
Allows for sending the custom status to the server via ajax.
 2013-08-27 23:52:44 +02:00
JC Brand
fd47d5ecb6 Add custom status form to the mockup. 2013-08-27 22:24:25 +02:00
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