JC Brand
b13ae5af69
Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master
...
Conflicts:
locale/locales.js
2013-10-03 08:58:25 +02:00
Boris Kocherov
f21dffbc27
Add Russian translation.
2013-09-25 14:49:17 +04:00
JC Brand
d1cc7b2cf0
Mention OTR support
2013-09-15 22:28:01 +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
00cb015d6a
Merge branch 'master' into otr
...
Conflicts:
converse.js
2013-09-10 23:33:30 +02:00
JC Brand
36c2a2ac45
Add option to hide the toolbar
2013-09-08 16:56:38 +02:00
JC Brand
ac3ac98c59
Allow chat statuses to be translated.
...
Add conf setting for allowing OTR.
2013-09-08 16:39:46 +02:00
JC Brand
58e6451ab9
Mention FR
2013-09-02 12:35:14 +02:00
JC Brand
fde8bb3500
New minified files. Bump version to 0.6.1
2013-08-30 00:00:34 +02:00
JC Brand
5cb74239c3
Update security info
2013-08-29 15:07:14 +02:00
JC Brand
202483130d
Bump version number for release.
2013-08-28 00:47:35 +02:00
JC Brand
79be6ea693
Add section about integration into other frameworks
...
Also expand on the security question.
2013-08-28 00:26:52 +02:00
JC Brand
9628189382
Can't call i18n.translate directly if we bundle without i18n support
2013-08-26 16:21:32 +02:00
JC Brand
4ae20ee1b7
Set release date
2013-08-25 23:42:49 +02:00
JC Brand
0fefc55ae1
Update CHANGES.txt.
2013-08-25 23:34:35 +02:00
JC Brand
810f5dec95
Merge branch 'sane-mockup'
...
Conflicts:
docs/html/searchindex.js
index.html
2013-08-24 15:44:58 +02:00
JC Brand
35d8f1d7e8
Use dev scripts with debug option
2013-08-24 02:16:26 +02:00
JC Brand
72d0f566fc
Merge branch 'master' into mockup
2013-08-15 20:47:50 +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
ae96dc1e64
Merge branch 'master' into mockup
...
Conflicts:
docs/html/_static/stylesheet.css
docs/html/searchindex.js
2013-08-15 18:01:26 +02:00
JC Brand
a5051f0061
Fix markup
2013-08-15 17:58:28 +02:00
JC Brand
af1a08e9b6
Docs are more stable and featured now.
2013-08-13 11:29:56 +02:00
JC Brand
861887fd77
Initial markup, testing out font icons
2013-08-09 20:25:21 +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
JC Brand
d1a743e6b5
Update index.html and give link to docs
2013-05-17 12:48:32 +02:00
JC Brand
008ae5ee8c
Add image credits
2013-05-09 22:29:36 +02:00
JC Brand
4caabf5013
Merge branch 'master' into gh-pages
...
Conflicts:
index.html
2013-04-26 14:33:08 +02:00
JC Brand
e389913444
Better service discovery support
...
Features are saved to localStorage so that service discovery doesn't have to
happen during every request.
2013-04-26 14:30:14 +02:00
JC Brand
bf5c5e36dc
Add security info and disclaimer
2013-04-25 01:06:37 +02:00
JC Brand
7850b3a54e
Add security info and disclaimer
2013-04-25 01:05:34 +02:00
JC Brand
b199690442
Update index.html and CHANGES.rst
2013-04-25 00:23:59 +02:00
JC Brand
93d31f260f
Update README and index.html
...
Now that standalone contact adding works
2013-04-21 00:06:18 +02:00
JC Brand
7066e70b68
Initialize converse inside main.js
2013-04-20 11:37:53 +02:00
JC Brand
58241cbb74
Make converse.js more modular
...
- Removed the $(document).ready handler. Instead, converse.initialize must be
called manually together with settings data.
- As a result the Plone specific event listeners are now also gone.
- Update tests and index.html to deal wit these changes
2013-04-20 11:32:54 +02:00
JC Brand
76676dc31d
Flatten header. Update text on index.html
2013-04-19 22:20:59 +02:00
JC Brand
fdd369eddd
Make the heading clickable (returns to home)
2013-04-19 22:11:25 +02:00
JC Brand
c1bb3ca773
Fix URLs
2013-04-19 17:12:35 +02:00
JC Brand
d646d859b3
Add section on tests
2013-04-19 00:40:02 +02:00
JC Brand
d394ad7ff2
Update index.html with Demo section
2013-04-19 00:09:04 +02:00
JC Brand
cedb6524ce
fix formatting
2013-04-18 23:06:51 +02:00
JC Brand
29c275bb93
Update description
2013-04-14 00:03:43 +02:00
JC Brand
8351977787
Merge branch 'gh-pages' of github.com:jcbrand/converse.js
...
Conflicts:
index.html
2013-04-12 15:59:08 +02:00
JC Brand
7001262419
Merge branches 'gh-pages' and 'master' of github.com:jcbrand/converse.js
2013-04-12 15:54:51 +02:00
JC Brand
ab14915954
Update info on XHR calls
2013-04-11 14:15:27 +02:00
JC Brand
6ca7eb0cbe
Add details of the 2nd screencast
2013-04-11 13:53:21 +02:00
JC Brand
30ad32cd7a
Update index.html again with custom changes
2013-04-02 00:16:58 +02:00
JC Brand
b0d73fc7e1
Trying to get analytics to work
2013-04-02 00:12:13 +02:00
JC Brand
9360da4310
Restore customizations
2013-04-01 23:57:58 +02:00
JC Brand
ce2c9d8547
Create gh-pages branch via GitHub
2013-04-01 14:53:33 -07:00