JC Brand
473cb30d77
Merge pull request #315 from GreenLunar/patch-2
...
Updated hebrew translation (0.8.8)
2015-02-08 19:22:25 +01:00
GreenLunar
64d0e77a56
Updated hebrew translation (0.8.8)
2015-02-08 13:10:41 +02:00
JC Brand
3e9994e01c
Websocket support. closes #204
2015-02-07 16:54:58 +01:00
JC Brand
95bc55c1c3
Merge branch 'master' into amd-strophe
2015-02-07 14:10:32 +01:00
JC Brand
af87d59e96
Add analytics for the documentation.
2015-02-07 14:07:31 +01:00
JC Brand
ec51c3660a
Add theming documentation and extend the docs on creating builds.
2015-02-05 15:58:51 +01:00
JC Brand
d20a8a65e4
Add a webserver for serving files during development.
2015-02-05 15:57:39 +01:00
JC Brand
75c4e8f118
Merge pull request #311 from gbonvehi/fix-show-online-presence-issue-305
...
Fix show online presence issue #305
2015-02-05 12:41:40 +01:00
JC Brand
04a14089e8
Merge pull request #312 from w3host/master
...
Updated hungarian translation (0.8.8)
2015-02-05 12:35:11 +01:00
JC Brand
ff7f312672
Merge branch 'master' of github.com:jcbrand/converse.js
...
Conflicts:
Makefile
2015-02-05 11:32:14 +01:00
JC Brand
e5e8539f2b
Fix the non-AMD usecase.
2015-02-03 22:39:03 +01:00
JC Brand
66bfdbd4c8
strophe-full wrapper has been renamed to strophe.
2015-02-01 18:56:23 +01:00
JC Brand
f283f6bce5
Fix failing tests after introducing AMD version of Strophe
2015-02-01 16:15:34 +01:00
JC Brand
5a253e32e1
Add AMD support for strophe.muc and strophe.vcard.
2015-02-01 00:50:57 +01:00
JC Brand
eb272c39e0
Formatting changes.
2015-01-30 16:01:00 +01:00
JC Brand
3b0a3b788c
Indented code.
2015-01-30 15:56:41 +01:00
JC Brand
0121914cda
Make strophe.roster.js an AMD module.
2015-01-30 15:55:46 +01:00
JC Brand
8eabf93cec
Fix typo
2015-01-30 15:54:59 +01:00
JC Brand
b7643eaba0
Initial work on letting converse.js use the AMD version of strophe.js
2015-01-27 15:10:58 +01:00
w3host
12f3431df7
Updated hungarian translation (0.8.8)
2015-01-25 23:54:56 +01:00
Guillermo Bonvehí
fc0a1d9dbd
Added test case for #305 and updated CHANGES.rst
2015-01-23 12:06:10 -03:00
Guillermo Bonvehí
fe03940f53
Fix issue #305 , show=online presence sent
...
setStatusMessage was modified to send the presence using
sendPresence method which skips show tag when type is 'online'
Added getStatus helper method
2015-01-23 11:16:16 -03:00
JC Brand
65b1898f03
Merge pull request #309 from gbonvehi/fix_strophe_log
...
Strophe.log and .error now calls converse.log, this honors converse.debu...
2015-01-23 12:23:51 +01:00
JC Brand
36f12c27b4
Merge pull request #310 from gbonvehi/use-jquery-browser
...
jquery.browser >=0.0.7 from master repo
2015-01-23 12:22:09 +01:00
Guillermo Bonvehí
b269041f38
jquery.browser >=0.0.7 from master repo
...
This closes issue #299 , Update to latest jquery.browser as pointed
out by @le717
2015-01-23 00:57:02 -03:00
Guillermo Bonvehí
025d032e7a
Added change to CHANGES.rst
2015-01-22 17:44:24 -03:00
Guillermo Bonvehí
5cd28ff71b
Strophe.log and .error now calls converse.log, this honors converse.debug flag
2015-01-22 17:38:36 -03:00
JC Brand
36ef0b64a7
Merge pull request #308 from gbonvehi/winbuild
...
Added new Makefile.win, it only has dev/build/check targets
2015-01-22 18:44:40 +01:00
Guillermo Bonvehi
972fe46bf0
Added build instructions for Windows environments.
...
Add Makefile.win example
Add Chocolatey references + required packages
2015-01-22 13:55:43 -03:00
Guillermo Bonvehi
6d29f03ae1
Added new Makefile.win, it only has dev/build/check targets
...
Gruntfile now appends .cmd extension to r.js if platform is win32
Made touch-npm/bower grunt task/targets
make -f Makefile.win to build on Windows
2015-01-22 11:46:28 -03:00
JC Brand
6aa38952ab
Make grunt path a variable and make other vars overridable
2015-01-18 19:10:22 +01:00
JC Brand
9c0feea10a
Bump require.js version
2015-01-17 13:26:16 +01:00
JC Brand
c646e93a9b
Don't set out message carbons IQ stanza on each page load.
2015-01-17 13:24:05 +01:00
JC Brand
ad0f8a336a
Update translation docs.
...
We now no longer need the step of pasting the json code into a standalong .js
file.
2015-01-16 23:06:06 +01:00
JC Brand
5379c5f294
Mention polish translations in readme.
2015-01-16 22:57:48 +01:00
JC Brand
5ed0e75ee5
Fix some style issues on the controlbox.
2015-01-16 22:56:23 +01:00
JC Brand
8478b432c3
Lazily call parseJSON on translation data.
...
Also, moved locales.js to ./src folder.
Add it as dependency to utils.js and remove it from the deps scripts
2015-01-16 22:33:18 +01:00
JC Brand
31cb3d4b6e
Fix the non-AMD case.
2015-01-16 22:07:27 +01:00
JC Brand
0a1a98d278
Load the JSON files directly for other langs as well.
2015-01-16 21:16:47 +01:00
JC Brand
d22ab21bbf
Proof of work. Load JSON file directly
...
instead of having to create a .js file with translations.
2015-01-16 21:04:38 +01:00
JC Brand
ba09fa1fbb
Generate JSON file from Polish po file.
2015-01-16 20:48:40 +01:00
JC Brand
7ac5785bae
Tweak shadow on the unselected tab.
2015-01-16 20:47:10 +01:00
JC Brand
76452982dc
Merge pull request #304 from ser/master
...
Polish translation of version 0.8.6.
2015-01-16 20:07:18 +01:00
JC Brand
cea68e5af0
Merge branch 'chat_states'
...
Conflicts:
docs/CHANGES.rst
2015-01-16 20:06:53 +01:00
Serge Victor
09594a7b87
Polish translation of version 0.8.6.
2015-01-12 18:52:22 +07:00
JC Brand
607c2a81c9
Instead of GONE, set chat_state to INACTIVE when a box is closed.
...
Also, fixed all broken tests.
2015-01-09 10:48:36 +01:00
JC Brand
b4d53aaa94
Some refactoring of chat states work. updates #292
...
- Don't add a timeout for the GONE state.
- Change state to GONE when the user closes the chat box.
- Change the state to inactive when the user minimizes the chat box.
- Change the state to active when the users maximizes the chat box.
- Add more tests for chat states.
2015-01-09 09:09:49 +01:00
JC Brand
4d6a354734
Merge branch 'gbonvehi-add-allow-registration-doc'
2015-01-07 14:55:21 +01:00
JC Brand
7df30beae2
Merge branch 'add-allow-registration-doc' of https://github.com/gbonvehi/converse.js into gbonvehi-add-allow-registration-doc
...
Conflicts:
docs/CHANGES.rst
2015-01-07 14:55:14 +01:00
JC Brand
4140cc12df
Merge pull request #302 from gbonvehi/solve-252-253-contact-info-tooltip
...
Add fullname and jid to contact's tooltip in roster
2015-01-07 14:52:04 +01:00
