Commit Graph

2207 Commits

Author SHA1 Message Date
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
JC Brand
a4e671887e rebundled and reminified 2013-07-24 23:59:18 +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
9a0531120d Add docstring 2013-07-24 23:56:03 +02:00
JC Brand
e4d2959969 Reminified, with and without locales 2013-07-24 23:21:09 +02:00
JC Brand
4cf866bc07 Re-minified 2013-07-24 23:15:29 +02:00
JC Brand
adbae0cb74 Fix for the previous fix :) 2013-07-24 23:11:41 +02:00
JC Brand
fd526a1832 Fix for the previous fix :) 2013-07-24 23:10:56 +02:00
JC Brand
203590d5cc Merge branch 'gh-pages' of github.com:jcbrand/converse.js into gh-pages 2013-07-24 23:00:37 +02:00
JC Brand
876f7c38b7 bugfix. Fixes #26. Only the first minute digit was shown.
Conflicts:
	CHANGES.rst
2013-07-24 23:00:15 +02:00
JC Brand
4c0d4f2ac5 bugfix. Fixes #26. Only the first minute digit was shown. 2013-07-24 22:58:53 +02:00
Matheus Figueiredo
cb41094d9e Brasilian Portuguese + back with italian 2013-07-24 17:12:17 -03:00
Matheus Figueiredo
476a8e0c3f Fixing some mistranslating 2013-07-24 16:52:49 -03:00
Matheus Figueiredo
f0a2ba650f Adding Brasilian Portuguese translation 2013-07-24 16:39:25 -03: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
3271f797e2 Bugfix. Typo in path. 2013-07-23 22:17:19 +02:00
JC Brand
4da378ea7a Add release date for 0.4 and add new changes for 0.5 2013-07-23 22:10:16 +02:00