JC Brand
|
ad4d959df5
|
Use my fork of requirejs-tpl since jfparadis isn't merging my changes
|
2014-03-14 20:16:31 +02:00 |
|
JC Brand
|
9849daacf9
|
Merge branch 'master' into 0.8
Conflicts:
bower.json
converse.js
docs/CHANGES.rst
spec/chatbox.js
tests/utils.js
tests_main.js
|
2014-03-09 08:18:00 +02:00 |
|
JC Brand
|
9b3af57d13
|
Release version 0.7.4
|
2014-03-05 08:44:01 +02:00 |
|
JC Brand
|
b9cf79505a
|
use new CryptoJS repo since the old one was removed.
Conflicts:
bower.json
tests_main.js
|
2014-02-28 09:45:10 +02:00 |
|
JC Brand
|
085234f9e8
|
use new CryptoJS repo since the old one was removed.
|
2014-02-28 04:08:09 +02:00 |
|
JC Brand
|
1ce7620b88
|
Merge remote-tracking branch 'origin' into 0.8
Conflicts:
converse.js
docs/CHANGES.rst
index.html
|
2014-02-23 02:54:35 +02:00 |
|
JC Brand
|
fb1ed29c8f
|
Bump release to version 0.7.3
|
2014-02-12 14:41:56 +02:00 |
|
JC Brand
|
55b9a4e568
|
Initial support for external HTMl templates. Updates #77
|
2013-12-31 01:07:11 +02:00 |
|
JC Brand
|
f97217cfd7
|
Add requirejs-text
|
2013-12-30 13:02:37 +02:00 |
|
JC Brand
|
e3e8bf6c69
|
New release 0.7.2
|
2013-12-18 17:07:11 +02:00 |
|
JC Brand
|
8cd05206cb
|
Bump release to 0.7.1
|
2013-11-17 17:15:07 +02:00 |
|
JC Brand
|
039173cff2
|
Use newest strophe.muc.js. Fixes #85
|
2013-11-17 15:57:53 +02:00 |
|
JC Brand
|
b140596b50
|
Bump version to 0.7 and minify css and js
|
2013-11-13 08:19:14 +02:00 |
|
JC Brand
|
f9c096c061
|
Use new otr.js release 0.27
|
2013-11-02 10:15:26 +02:00 |
|
JC Brand
|
1fa47c6633
|
Merge branch '0.6.x'
Conflicts:
converse.min.js
docs/html/searchindex.js
|
2013-10-16 11:50:55 +02:00 |
|
JC Brand
|
29fc658c05
|
New release, 0.6.6
|
2013-10-16 11:26:22 +02:00 |
|
JC Brand
|
b6a6562de9
|
Merge branch '0.6.x'
Conflicts:
Makefile
converse.css
converse.min.css
converse.min.js
docs/doctrees/index.doctree
docs/html/index.html
docs/html/searchindex.js
|
2013-10-08 22:12:12 +02:00 |
|
JC Brand
|
90be11aee8
|
New release: 0.6.5.
Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
|
2013-10-08 09:11:04 +02:00 |
|
JC Brand
|
8f14c32b48
|
Use newest (unreleased) otr.js so that we can specify paths ourselves
|
2013-10-03 10:18:07 +02:00 |
|
JC Brand
|
6517b9bb9d
|
Merge branch 'otr'
Conflicts:
CHANGES.rst
locale/af/LC_MESSAGES/af.js
locale/af/LC_MESSAGES/converse.json
locale/af/LC_MESSAGES/converse.po
locale/converse.pot
locale/de/LC_MESSAGES/converse.po
locale/en/LC_MESSAGES/converse.po
locale/es/LC_MESSAGES/converse.po
locale/fr/LC_MESSAGES/converse.po
locale/it/LC_MESSAGES/converse.po
locale/pt_BR/LC_MESSAGES/converse.po
|
2013-09-15 22:08:34 +02:00 |
|
JC Brand
|
9c75683354
|
Bump versions and re-minified
|
2013-09-15 21:35:03 +02:00 |
|
JC Brand
|
6768924884
|
Bump versions and re-minified
|
2013-09-15 21:29:02 +02:00 |
|
JC Brand
|
d402ed8e8e
|
Merge branch 'master' into otr
Conflicts:
locale/af/LC_MESSAGES/converse.po
locale/converse.pot
|
2013-09-12 20:57:51 +02:00 |
|
JC Brand
|
84915290b2
|
Correct version is 0.6.3
|
2013-09-12 16:00:31 +02:00 |
|
JC Brand
|
008bac4f21
|
Bump version and minimize files.
|
2013-09-12 15:51:30 +02:00 |
|
JC Brand
|
68a9909311
|
Bump version everywhere and regenerate docs.
|
2013-09-12 15:33:11 +02:00 |
|
JC Brand
|
08d25643f0
|
Bump otr.js version
|
2013-09-01 21:36:59 +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
|
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 |
|