JC Brand
96df8dea97
Merge branch 'Placeholder-for-translation' of https://github.com/thierrytiti/converse.js into thierrytiti-Placeholder-for-translation
...
Conflicts:
src/templates/toolbar.html
2015-05-15 14:39:02 +02:00
thierrytiti
7a359562ad
Add placeholder for 'Insert a smiley'
2015-05-15 12:01:29 +02:00
JC Brand
3ea3ac52a3
Merge branch 'master' into plugins-refactor
2015-05-15 11:32:33 +02:00
thierrytiti
e64c19fc18
Bugfix. fullname is null
...
wrong callback argument mapping in XmppStatus initialize: fullname is
null
2015-05-15 11:05:26 +02:00
JC Brand
cd759a7174
Fixes around using bare jid for roster and chats.
...
- Make sure the bare jid is used as roster contact id.
- Save the resource when creating a new roster contact
- In getWrappedChatBox, get roster item by bare jid
- In getWrappedChatBox, make sure the chat box is created from bare jid
2015-05-15 00:33:23 +02:00
JC Brand
3fc0ef1e70
Remove snippet of code that's not being used.
2015-05-15 00:33:23 +02:00
JC Brand
5fce1556b1
Merge pull request #397 from jacobdanner/patch-2
...
add .cmd extensions to makefile.win
2015-05-15 00:31:23 +02:00
Jacob Danner
707712e65c
add .cmd extensions to makefile.win
...
I was getting the following error while running make all on my windows machine
"""
node_modules/.bin/bower install
'node_modules' is not recognized as an internal or external command,
operable program or batch file.
make: *** [stamp-bower] Error 1
"""
This was resolved by adding the complete extension to the windows path.
2015-05-14 11:45:37 -07:00
thierrytiti
e35c5a4fa3
Indentation
2015-05-14 13:55:39 +02:00
JC Brand
695dffac90
Merge branch 'master' into plugins-refactor
2015-05-14 12:08:32 +02:00
thierrytiti
be102de031
Bugfix if auto_away=0 and auto_xa>0
...
In this case, it will force changing presence even if the user
specificly set another status.
2015-05-13 16:25:26 +02:00
thierrytiti
6034932523
Update converse.js
2015-05-13 13:57:22 +02:00
thierrytiti
d631af58a9
Automatic Away Mode
...
Add functions for changing user presence to ``away`` or ``xa``
2015-05-13 13:51:24 +02:00
JC Brand
d5ead50b5a
Tweaked the padding a bit
2015-05-11 18:01:01 +02:00
thierrytiti
f521532f2f
Language Detection
...
Replace default en language to autodetection if no i18n setting is set.
2015-05-11 17:36:12 +02:00
thierrytiti
a69ceba813
typo
2015-05-11 09:43:44 +02:00
JC Brand
42437ffa91
Bind overridden methods to the plugin context
2015-05-10 17:15:15 +02:00
JC Brand
91638cabe1
Add support for "overrides" namespace convention in plugins.
2015-05-10 00:51:36 +02:00
JC Brand
0511f9a588
Merge pull request #389 from gbonvehi/add-login-placeholders-roster-item-name
...
Added login-panel placeholder and roster-item Name translations
2015-05-09 10:09:53 +02:00
Guillermo Bonvehí
2e516f347e
Updated CHANGES
2015-05-08 14:12:14 -03:00
Guillermo Bonvehí
70191eac00
Added login-panel placeholder and roster-item Name translations
...
This will allow to translate 'user@server' and 'password' in the login
screen and also in the roster-item tooltip, there's 'Name:' which can
now be translated
2015-05-08 14:08:09 -03:00
JC Brand
1cf8cfc9f6
Merge pull request #387 from gbonvehi/fix-unload-clearSession
...
Fixed an error that appears when unload event is triggered
2015-05-08 10:55:29 +02:00
Guillermo Bonvehí
ef305fff55
Updated CHANGES.rst
2015-05-07 12:59:36 -03:00
Guillermo Bonvehí
71ea60e44a
Fixed an error that appears when unload event is triggered
...
This happens when you load a page with converse and do not login to
the chat. It can be tested in converse.org preserving logs while
navigating to another page.
Inside clearSession there's a call to roster which is not initalized
and also another one to controlbox.save which is not set so it fails
with an url error during sync.
2015-05-07 12:47:32 -03:00
JC Brand
c0bec459a0
Bugfix. See below.
...
Manual login doesn't work when websocket_url is set and not bosh_service_url
It's already a while since we don't include an input for the bosh_service_url in the login panel.
2015-05-06 16:46:37 +02:00
JC Brand
9f5f5da7ed
Created method insertIntoPage
...
Put the code that inserts a chat box into the page in it's own method,
so that it can be overridden from a plugin.
2015-05-03 17:43:22 +02:00
JC Brand
f868917d54
Add an "Edit me on Github" ribbon to the docs
2015-05-02 01:21:25 +02:00
JC Brand
e15ec7d443
Add an initial user manual for converse.js
2015-05-02 00:22:50 +02:00
JC Brand
d6a1dee2d2
Rename the placeholder for contact adding
...
to make it clearer what a JID should look like.
2015-05-02 00:21:11 +02:00
JC Brand
f635e4efc0
Tell bower to ignore the mockup and docs dirs.
2015-05-02 00:20:43 +02:00
JC Brand
2e297a1c84
Some tweaking of the css.
...
Make the text part of an input-group a bit wider and other padding/margin
tweaking.
2015-05-01 18:49:39 +02:00
JC Brand
6088eaf9dc
Remove strophe.roster.js and update changelog.
2015-05-01 14:50:27 +02:00
JC Brand
3afc0e58bc
Bugfixes to make profiling work again.
2015-05-01 14:34:20 +02:00
JC Brand
34630693b7
Merge branch 'master' into roster_refactor
...
Conflicts:
locale/en/LC_MESSAGES/converse.po
2015-05-01 12:37:43 +02:00
JC Brand
145fd016a3
New release: 0.9.3
2015-05-01 12:29:48 +02:00
JC Brand
ea56df4b63
Updated af and de translations.
2015-05-01 12:25:59 +02:00
JC Brand
e7180f20b1
Add Ukranian translations
2015-05-01 11:16:23 +02:00
JC Brand
4c06564242
Merge pull request #380 from pzia/docubuntu
...
Note for debian & ubuntu users
2015-04-26 11:58:43 +02:00
JC Brand
05e98f8ef9
fix typo. stamp-node must be stamp-npm
2015-04-26 11:57:42 +02:00
pzia
66c36ca57f
check for stamp-npm (not stamp-node)
2015-04-26 11:26:53 +02:00
pzia
68d111e4b7
bundler is not needed anymore as a debian package
2015-04-26 11:13:35 +02:00
pzia
9127b0745a
Merge https://github.com/jcbrand/converse.js into docubuntu
2015-04-26 11:12:06 +02:00
JC Brand
80943f9d24
Make sure that bundler also gets installed.
...
- Added a stamp file for bundler.
- We now specify binary paths for bundler and Sass.
- Added a step "watch" to watch the Sass files.
- Add map file for Sass/CSS
2015-04-26 09:44:29 +02:00
pzia
7e44694d66
Note for debian & ubuntu users
2015-04-26 07:56:22 +02:00
JC Brand
3df0c95714
Merge branch 'master' into roster_refactor
2015-04-25 23:37:12 +02:00
JC Brand
c2be6019f7
Remove type="email" from JID input.
2015-04-25 23:34:52 +02:00
JC Brand
aa3de742c0
Merge branch 'master' into roster_refactor
2015-04-25 23:06:59 +02:00
JC Brand
6d0efe0f82
Generate JSON from the new fr po file
2015-04-25 22:49:49 +02:00
JC Brand
a3da42aeed
Update changelog
2015-04-25 22:45:16 +02:00
thierrytiti
9da6c0e9ec
French translation
2015-04-25 22:43:19 +02:00
