Commit Graph

81 Commits

Author SHA1 Message Date
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
JC Brand
66b92fedcb Add debug option explicitly 2013-08-15 20:43:39 +02:00
JC Brand
9b9bf1ce89 Fix markup 2013-08-15 19:30:33 +02:00
JC Brand
af1a08e9b6 Docs are more stable and featured now. 2013-08-13 11:29:56 +02:00
JC Brand
f7c579e7e6 Add OTR to bower.json and converse.js 2013-08-09 19:22:49 +02:00
JC Brand
944593de8a Merge branch 'master' into gh-pages 2013-08-05 09:39:43 +02:00
JC Brand
405d308ae0 Remove references to online tests URL.
Testing requires jasmine and require which are not bundled anymore but instead
installed via bower.
2013-08-05 09:38:34 +02:00
JC Brand
4b48e8ac69 Merge branch 'master' into gh-pages 2013-08-05 09:28:18 +02:00
JC Brand
2d4a14ac2d Don't expose the Strophe connection object globally.
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
2013-08-05 09:25:29 +02:00
JC Brand
c62a4ae575 Merge branch 'master' into gh-pages
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
2013-08-04 18:51:33 +02:00
JC Brand
a13a69c493 Bump version to 0.5.1 2013-08-04 18:48:29 +02:00
JC Brand
1f772f4691 Merge branch 'master' into gh-pages
Conflicts:
	index.html
2013-08-04 18:46:51 +02:00
JC Brand
eb39faa732 Re-minified files (without version numbers). 2013-08-04 18:43:55 +02:00
JC Brand
f0a2f25916 Fix download links 2013-08-02 23:26:14 +02:00
JC Brand
a01f954397 Fix download links 2013-08-02 23:25:41 +02:00
JC Brand
7c0e7049f2 Pin version in index.html 2013-07-30 23:42:05 +02:00
JC Brand
163d8f60d9 Pin version in index.html 2013-07-30 23:41:28 +02:00
JC Brand
5f97f7ea28 Merge branch 'master' into gh-pages
Conflicts:
	build.js
	converse.min.css
	converse.min.js
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html
2013-07-30 23:40:59 +02:00
JC Brand
ce1dce629c Create new release, version 0.5.0 2013-07-30 23:17:13 +02:00
JC Brand
868ae82bb0 Fixed paths to bower's components dir 2013-07-29 22:40:19 +02:00
JC Brand
4eec2251e7 Better mention of translations 2013-07-28 23:15:49 +02:00
JC Brand
f96515b989 Merge pull request #28 from matheus-morfi/languageptbr
Adding pt_BR translations
2013-07-26 16:54:08 -07:00
JC Brand
1281b86e23 Set lang to en 2013-07-27 01:35:28 +02:00
JC Brand
e940b53d6a Set lang to en 2013-07-27 01:35:04 +02:00
JC Brand
e2ed7757ff Merge branch 'master' into gh-pages
Conflicts:
	CHANGES.rst
	docs/doctrees/environment.pickle
	index.html
2013-07-27 01:23:27 +02:00
JC Brand
7cbeff0d01 Wrap initialize with require so that we know converse is defined 2013-07-27 01:19:32 +02:00
Matheus Figueiredo
6c5a9efe0c Using dict format to allow standard lang codes
Allowing standard language code makes easier to backends to send it to
converse.js keeping coherence.
2013-07-25 17:26:48 -03:00
JC Brand
05c2c95b5f Merge branch 'master' into gh-pages
Conflicts:
	CHANGES.rst
	converse.min.js
2013-07-25 00:19:13 +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
e3d0ae6d21 Fix contact form 2013-07-24 12:23:21 +02:00
JC Brand
a2b819b9f9 Fix contact form 2013-07-24 12:21:36 +02:00
JC Brand
084423d2e8 Add twitter and identica links 2013-06-05 08:42:34 +02:00
JC Brand
53a80d5e86 Merge branch 'master' into gh-pages 2013-06-03 22:59:59 +02:00
JC Brand
11d3da1e61 Update download link to version 0.4 2013-06-03 22:59:18 +02:00
JC Brand
cb2e2d77e3 Use minified resources 2013-06-02 22:34:49 +02:00
JC Brand
3ff38ff326 Updated docs 2013-06-02 22:33:29 +02:00
JC Brand
0b1900ecb1 Don't use minified resources in master branch 2013-06-02 21:44:48 +02:00
JC Brand
ab1b43110a Use minified resources 2013-06-02 21:41:06 +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
2e28b820d1 Merge branch 'master' into gh-pages
Conflicts:
	locale/hu/LC_MESSAGES/converse.po
2013-06-02 20:02:10 +02:00
JC Brand
6464acff5c Merge branch 'master' into gh-pages 2013-06-02 00:53:38 +02:00
JC Brand
71d6585a31 Update CHANGES and index.html 2013-06-02 00:42:22 +02:00
JC Brand
4f03f43efa Merge branch 'master' into gh-pages 2013-05-31 12:04:58 +02:00
JC Brand
cd72a0a16e Add contact details 2013-05-31 12:04:31 +02:00
JC Brand
e4266e1015 Use minified css 2013-05-31 11:57:27 +02:00
JC Brand
1ae5aaed37 Use minified JS 2013-05-28 21:04:43 +02:00
JC Brand
cf7d9b2e5b I don't think minified JS and CSS should be default
To aid with dev
2013-05-28 20:21:44 +02:00
JC Brand
6ea339ca31 Reminified css and js and don't use 0.3 tag anymore 2013-05-26 19:09:33 +02:00
JC Brand
1bac792420 Add minified files and use them in index.html 2013-05-22 19:29:37 +02:00
JC Brand
614f1c7753 Update download links to 0.3 release 2013-05-21 17:05:20 +02:00