Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
2,085 Commits 2 Branches 109 Tags 304 MiB
8e5d481e1c
Commit Graph

2085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
8e5d481e1c Merge branch 'auto-away' of https://github.com/thierrytiti/converse.js into thierrytiti-auto-away 
Conflicts:
	converse.js
 2015-05-27 20:01:22 +02:00
JC Brand
c4698613ac Merge pull request #414 from thierrytiti/ping-pong 
XEP-0199: XMPP Ping
 2015-05-27 19:25:32 +02:00
thierrytiti
fb589398ad XEP-0199: XMPP Ping 
Use modified StropheJS ping plugin (AMD support)
Add Ping functionality
Add Pong handler

Fix to issue #144:
 2015-05-27 18:14:58 +02:00
JC Brand
7c21341d74 Merge pull request #410 from thierrytiti/offline-status 
Offline Pretty Status
 2015-05-27 13:52:49 +02:00
thierrytiti
24b204e8a4 Offline Pretty Status 
add offline as possible case to enable translation
 2015-05-26 18:36:17 +02:00
JC Brand
0e47e72cf4 Merge pull request #407 from thierrytiti/CSS-font-path 
CSS: Fonts Path: editable $font-path via sass/variables.scss
 2015-05-22 14:20:27 +02:00
thierrytiti
05cc4d714a CSS: Fonts Path: editable $font-path via sass/variables.scss 
Add a variable to build CSS with another path for the fonts
import added in  ``sass/converse.scss`` : Undefined variable $font-path
with ``make css``
 2015-05-22 13:57:50 +02:00
JC Brand
fc1768d12d Fixes #406. 
Call to registerRosterXHandler and registerPresenceHandler on onReconnected give exception.
 2015-05-21 17:04:56 +02:00
JC Brand
6afcc0fbe1 Bring lang detect code in line with coding style. 
Change html files so that we auto-detect the lang now.
 2015-05-20 19:31:59 +02:00
JC Brand
99a017fc8a Merge branch 'thierrytiti-detect_lang' 2015-05-20 19:20:25 +02:00
JC Brand
1d0ffe34ab Merge branch 'detect_lang' of https://github.com/thierrytiti/converse.js into thierrytiti-detect_lang 2015-05-20 19:20:17 +02:00
JC Brand
b08b225308 Merge pull request #405 from thierrytiti/css-fix 
Css fixes
 2015-05-20 18:43:21 +02:00
thierrytiti
7fb4ad3050 CSS rebuild with sass 2015-05-20 18:27:21 +02:00
thierrytiti
08c94be1b7 CSS Fixes 
main div conversejs
- left and width: The last 35px at bottom of the page is not clickable
- right: in some case (e.g. frame in div), the div is over the vertical
scrollbar

room-info:
- wrong placement on hover after information fetched on a room
 2015-05-20 17:52:19 +02:00
thierrytiti
a660f853c1 XEP-0352: Client State Indication 
XEP-0352 support added to Auto Away Mode
 2015-05-20 12:12:08 +02:00
JC Brand
44b13c1da3 Delete unused build files. 
These files can still be built by running `make build`. However we remove them
from version control because they bloat the repo, especially diffs of minified
files, which are large.
 2015-05-20 09:34:41 +02:00
JC Brand
61843c2838 Updated JSON file with French translations. 2015-05-20 09:26:32 +02:00
JC Brand
df0222d543 Merge pull request #401 from thierrytiti/French_translation 
French Translation
 2015-05-20 09:25:09 +02:00
thierrytiti
aebd59825c Changelog 
French translation
 2015-05-15 19:09:12 +02:00
thierrytiti
871336fe56 French Translation 2015-05-15 19:07:45 +02:00
JC Brand
3cbb93479f Mention json header. updates #395. 2015-05-15 14:46:09 +02:00
JC Brand
68bcc9d0eb Merge pull request #399 from thierrytiti/bugfixes 
Bugfix. fullname is null
 2015-05-15 14:41:18 +02:00
JC Brand
2d30689a86 Merge branch 'thierrytiti-Placeholder-for-translation' 2015-05-15 14:39:18 +02:00
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
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
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
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