Commit Graph

724 Commits

Author SHA1 Message Date
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
62c314ff66 Remove the Libraries dir and fix paths in converse.js 2013-07-29 22:22:12 +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
JC Brand
b1363c9b98 Fix image. Fix typo and add link to docs 2013-07-28 23:47:12 +02:00
JC Brand
8c80191a96 Update the readme with link to demo and info on tests 2013-07-28 23:39:11 +02:00
JC Brand
bacc288bea Add .travis.yml 2013-07-28 23:24:04 +02:00
JC Brand
4eec2251e7 Better mention of translations 2013-07-28 23:15:49 +02:00
JC Brand
45bd56753d Bugfix in translation files. Make sure Jed is defined. 2013-07-28 23:12:21 +02:00
JC Brand
63a4a57b3b Remove (empty) hungarian translation files.
I added them for someone who promised hu translations, but they are now just
taking up space.
2013-07-28 23:11:08 +02:00
JC Brand
c2b8cd3f00 Remove unused dir (was from gh-pages) 2013-07-28 23:02:29 +02:00
JC Brand
38060c38e5 Mention JSHint in CONTRIBUTING.rst 2013-07-28 22:59:01 +02:00
JC Brand
8e04ea51c3 Add grunt task to run the tests.
- Removed phantom-jasmine, not used.
- Updated CONTRIBUTING.rst
2013-07-28 22:51:25 +02:00
JC Brand
c85c9f043a Separate update intervals for browser and phantomjs 2013-07-28 22:21:56 +02:00
JC Brand
143875bf32 Add jasmine and jasmine-html as require deps. Also add Console reporter 2013-07-28 21:20:36 +02:00
JC Brand
8f8ecbd78c Add missing semi-colon (jshint) 2013-07-27 10:53:22 +02:00
JC Brand
a9a3724766 Initial works towards having headless tests with PhantomJS 2013-07-27 10:51:55 +02:00
JC Brand
d64d5b7e8d Fix build.js and reminify files 2013-07-27 02:11:37 +02:00
JC Brand
300b5f7873 Fix build.js and reminify files 2013-07-27 02:11:04 +02:00
JC Brand
3746d332a3 Merge branch 'master' into gh-pages
Conflicts:
	docs/doctrees/environment.pickle
	docs/html/searchindex.js
	index.html
2013-07-27 02:07:33 +02:00
JC Brand
33fd8b3cc6 Renamed pt_BR file for consistency. Fixed some bugs. 2013-07-27 02:05:55 +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
48e3c73d2c Merge pull request #29 from matheus-morfi/spinnertocss
Removing spinner after login attempt
2013-07-26 16:52:06 -07:00
JC Brand
cc3bba27be Remove unneeded languages from non-AMD example 2013-07-27 01:49:59 +02:00
JC Brand
07e87d7b50 docs w.r.t using development files with(out) require.js. Updates #9 2013-07-27 01:48:40 +02:00
JC Brand
2ff631f597 Add example page to show non-AMD script loading. Updates #9 2013-07-27 01:47:46 +02: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
9501bad94c Add single_locale.js 2013-07-27 01:21:08 +02:00
JC Brand
7cbeff0d01 Wrap initialize with require so that we know converse is defined 2013-07-27 01:19:32 +02:00
JC Brand
1fa11d01f7 Remove dependency on AMD/require.js. Updates #9 2013-07-27 01:10:18 +02:00
JC Brand
527c96afd1 Make sure the info icon doesn't get cut off. 2013-07-27 01:07:26 +02:00
JC Brand
509b2c307c Merge branch 'master' of github.com:jcbrand/converse.js
Conflicts:
	converse.js
2013-07-27 00:07:59 +02:00
JC Brand
d04a1aa19a Call setStatus so that status is broadcasted 2013-07-27 00:05:48 +02:00
Sergio Oliveira
95a2f23d15 Removing spinner after login attempt 2013-07-26 15:30:30 -03: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
Matheus Figueiredo
991bdc2ea1 Addind pt_BR to minified 2013-07-25 16:59:32 -03:00
Matheus Figueiredo
db45b1d9b4 Merge branch 'master' into languageptbr
Conflicts:
	locale/locales.js
2013-07-25 15:35:46 -03:00
JC Brand
eb9e53007a Add node_modules to .gitignore 2013-07-25 09:46:39 +02:00
JC Brand
f318ec226a Add grunt dependencies and Gruntfile.js 2013-07-25 09:46:03 +02:00
JC Brand
18565e7977 Remove trailing whitespace 2013-07-25 09:45:35 +02:00
JC Brand
1c95e473f9 Regenerated package.js (via npm init) 2013-07-25 09:12:17 +02:00
JC Brand
5c5564b120 Remove no-locales file, it wasn't built properly
Update docs to not mention it

Conflicts:
	docs/doctrees/environment.pickle
2013-07-25 00:22:57 +02:00
JC Brand
01fb643378 Remove no-locales file, it wasn't built properly
Update docs to not mention it
2013-07-25 00:21:42 +02: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
d8f86eec6d Minified css 2013-07-25 00:11:29 +02:00
JC Brand
a679551928 Minified css 2013-07-25 00:10:59 +02:00
JC Brand
edc578b8b7 Update documentation 2013-07-25 00:09:09 +02:00
JC Brand
ded2b23388 Re-bundled and reminified 2013-07-25 00:08:57 +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