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
|
fde8bb3500
|
New minified files. Bump version to 0.6.1
|
2013-08-30 00:00:34 +02:00 |
|
JC Brand
|
202483130d
|
Bump version number for release.
|
2013-08-28 00:47:35 +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
|
6313b6c0ee
|
Merge branch 'master' into otr
|
2013-08-25 14:32:28 +02:00 |
|
JC Brand
|
f4eeb50438
|
Update CHANGES.rst and newest version number
|
2013-08-25 12:58:07 +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 |
|
HaNdTriX
|
fd6fdd748d
|
Update bower.json
The version specified in the bower.json of package converse mismatches the tag (0.5.2 vs 0.5.0)
|
2013-08-13 12:06:58 +02:00 |
|
JC Brand
|
f7c579e7e6
|
Add OTR to bower.json and converse.js
|
2013-08-09 19:22:49 +02:00 |
|
JC Brand
|
d49bb25333
|
Stupid issue.
With jquery > 1.8.3, $(window).trigger('focus') doesn't trigger the handler.
Manually focusing the window does however trigger the handler.
|
2013-07-30 00:13:59 +02:00 |
|
JC Brand
|
883c64cc16
|
Add bower as npm dependency
- Also added bower.json with all 3rd party dependencies specified
- And .bowerrc to specify components dir
|
2013-07-29 22:20:52 +02:00 |
|