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
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
2c0ae11fb7
Remove sjcl, which is not being used anymore
2013-08-25 23:27:07 +02:00
JC Brand
a95634fb26
Add crypto.aes to tests_main
2013-08-25 12:20:26 +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
7ee9b56d8f
Add require, otherwise it's not included in the minified file
2013-07-30 23:02:18 +02:00
JC Brand
7ed30139d6
Move path and shim configs from converse.js to main.js
...
This should make it easier to create custom builds, e.g. with more or less
dependencies.
2013-07-29 22:34:33 +02:00
JC Brand
c21a235243
Make sure the converse object is globally available
...
We need it so that we can call initialize from the HTML template
2013-07-25 00:07:44 +02:00
JC Brand
9e05ed8d76
Moved call to initialize to HTML markup
...
- This is more user-friendly and we want it to be outside of the files bundled
and minimized by require.js
2013-07-24 23:58:04 +02:00
JC Brand
9b5c9138fb
Add a config option to by default show the controlbox
2013-06-02 21:40:05 +02:00
JC Brand
895df5fff5
Add default config values to main.js (for reference)
2013-06-02 19:59:21 +02:00
JC Brand
7f4f3d7def
Add default config options to converse.js
2013-05-21 16:48:51 +02:00
JC Brand
b3ed43c450
Don't fetch rooms on roster or when leaving a room
...
Inefficient, causes way too much traffic and takes very long
2013-05-09 17:07:52 +02:00
JC Brand
df7f1ccf2c
Use feature discovery on chatrooms
2013-05-09 15:39:27 +02:00
JC Brand
2708d976db
typo and comment
2013-04-26 21:52:26 +02:00
JC Brand
62a2e307a5
Add initial service discovery (XEP 30) support.
...
- Still needs caching and optimisation
2013-04-25 23:53:33 +02:00
JC Brand
b36d2f18e5
Add support for the BOSH bind URL as a setting parameter
2013-04-25 00:21:54 +02:00
JC Brand
7066e70b68
Initialize converse inside main.js
2013-04-20 11:37:53 +02:00
JC Brand
df931af213
Re-implement the login dialog as part of the controlbox.
2013-03-21 10:54:41 +02:00
JC Brand
d3c7c04571
Remove hardcoded values
2013-03-06 11:40:15 +02:00
JC Brand
7f4206e9b2
Update changes
2013-03-05 22:59:30 +02:00
JC Brand
c17ffdb98a
Added functionality to connect to an XMPP server.
...
Can succesfully connect now, but still need to get rid of ajax calls to @@xmp-userinfo, and replace them with
VCards.
2012-11-20 13:23:03 +02:00
JC Brand
45fbb8f830
Add main.js (for require.js)
2012-11-02 13:46:12 +02:00
