JC Brand
|
96d904f38e
|
Merge branch 'master' into skeleton
|
2014-12-31 11:34:34 +01:00 |
|
JC Brand
|
063e31e39e
|
Add skeleton-sass and convert css files to scss.
|
2014-12-13 00:14:11 +01:00 |
|
JC Brand
|
303a412b38
|
New release 0.8.6
|
2014-12-07 22:50:10 +01:00 |
|
JC Brand
|
92ed46f844
|
New release 0.8.5
|
2014-12-01 20:53:08 +01:00 |
|
JC Brand
|
9018dc49a7
|
Use branch of strophejs-plugins
|
2014-11-16 22:26:56 +01:00 |
|
JC Brand
|
c98e516e39
|
New release 0.8.4
|
2014-11-15 16:40:34 +01:00 |
|
JC Brand
|
9c4e7779f0
|
Fix github url to use https instead of ssh
|
2014-10-28 16:20:33 +01:00 |
|
JC Brand
|
7e4c1d6d8d
|
Keep a local customized copy of strophe.roster.js
The new changes made to strophe.roster.js are incompatible with the way
converse.js works.
Will likely replace strophe.roster.js completely.
|
2014-10-27 21:54:00 +01:00 |
|
JC Brand
|
4a89d28e38
|
Fix tests by depending on jquery obj.
Also fixed groupchat test by getting and including correct msg id.
|
2014-10-15 19:16:02 +02:00 |
|
JC Brand
|
5b17becfad
|
Use newest strophe.muc.js and use strophejs-plugins bower resource where possible.
|
2014-10-15 18:37:41 +02:00 |
|
JC Brand
|
d6110a1e52
|
Patch all scripts that rely on jquery to be AMD compatible.
|
2014-10-07 18:17:19 +02:00 |
|
JC Brand
|
85f8624087
|
Use patched jquery.browser.
|
2014-10-06 21:27:06 +02:00 |
|
JC Brand
|
d8bf1961a7
|
Making a 0.8.3 release.
The 0.8.2 release didn't include new builds due to an unnoticed build error.
|
2014-09-22 18:17:40 +02:00 |
|
JC Brand
|
56ec4cf7bc
|
New release 0.8.2
|
2014-09-22 17:57:56 +02:00 |
|
JC Brand
|
090888ad99
|
Use newer version of strophe.muc.
|
2014-09-21 00:20:10 +02:00 |
|
JC Brand
|
0ca5f602e7
|
Use strophe from bower packages
|
2014-09-06 13:03:58 +02:00 |
|
JC Brand
|
ad99e72279
|
Merge branch 'master' into user-invite
|
2014-08-31 02:06:02 +02:00 |
|
JC Brand
|
6f80bd5a3d
|
Pin newer version of strophe.muc.js that contains bugfix
|
2014-08-31 02:05:39 +02:00 |
|
JC Brand
|
f1555774f0
|
Add typeahead.js as dependency and integrate. updates #215.
|
2014-08-26 19:59:48 +02:00 |
|
JC Brand
|
0969f4ca62
|
Include new strophe.muc.js. fixes #178
|
2014-08-25 15:27:06 +02:00 |
|
JC Brand
|
c9958182ff
|
Making 0.8.1 release
|
2014-08-23 11:15:56 +02:00 |
|
JC Brand
|
2ff7061ea2
|
jquery.tinysort is no longer used.
|
2014-08-04 20:18:51 +02:00 |
|
JC Brand
|
ba9e9cfd15
|
Manage fontawesome via bower
|
2014-07-20 00:21:04 +02:00 |
|
JC Brand
|
9d84ede2f9
|
Two website deps (jquery-easing & bootstrap) now managed by bower
|
2014-07-06 15:56:44 +02:00 |
|
JC Brand
|
8aedc3fcf7
|
Integrate backbone.browserStorage. Fixes #176
Data is now by default cached in sessionStorage and not localStorage.
Can be configured via the "storage" option.
|
2014-06-30 18:53:58 +02:00 |
|
JC Brand
|
81f3814e32
|
Refactor code out into backbone.overview
|
2014-06-01 15:28:52 +02:00 |
|
JC Brand
|
14d90bc99c
|
Upgrade dependencies to their latest versions
|
2014-04-19 05:12:24 +02:00 |
|
JC Brand
|
bf6474ff6d
|
Upgrade jquery to 1.11.0 and add jquery.browser
|
2014-04-19 01:52:44 +02:00 |
|
JC Brand
|
7d472eb26d
|
Add new dependency moment.js
Use it to better compare dates when trying to determine whether a message falls
on a different day.
Also upgraded some dependencies' versions.
|
2014-04-19 01:30:48 +02:00 |
|
JC Brand
|
2a83d557d1
|
Order Makefile a bit more and bump release number
|
2014-04-18 17:47:47 +02:00 |
|
JC Brand
|
17a05ce801
|
Use fork of strophe.js which includes already built file.
Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.
|
2014-03-17 22:41:21 +02:00 |
|
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 |
|