ichim-david
083f76b7cc
Fixed merge conflicts for converse.js
2013-02-22 16:45:42 +02:00
Alexandru Ghica
8c45f23255
Better message on error
...
Changed message from "conecting" to "error" as in this case
communication was over and was an error.
2013-02-22 15:51:50 +02:00
Alexandru Ghica
b6af624b14
Code clean up
...
Cleaned up unnecessary spaces, replaced tabs with spaces and fixed line
terminators.
2013-02-22 15:42:35 +02:00
ichim-david
32ebfe5372
Changed the following:
...
- Show the xmppchat-roster only after all of the items have been added
from first run of rosterHandler
- Resort the items only when the presence has changed and not when the
resource attribute has changed
2013-02-22 14:29:49 +02:00
ichim-david
66d7b51535
Changed the following:
...
- Pass an option object to addRosterItem which can contains information about
the object catched in the rosterHandler.
In this case I am marking the last item available in the roster of the
person for which this handler is triggered
2013-02-21 22:36:41 +02:00
ichim-david
a256645d6d
Removed rendering of rosterview since I've added check to render only with passed item and the result is the same without the rendering
2013-02-21 22:24:09 +02:00
ichim-david
3cf671884c
Fixed the following:
...
- Fixed function has inconsistent return points by always specifying
returns instead of returning only on condition
- Set room-jid as data-room-jid attribute to validate html5
- Added missing semicolon
2013-02-21 21:28:40 +02:00
ichim-david
447c3a8d41
Set modifications of model attributes only if the item received from the rosterHandler has different options
2013-02-21 20:57:22 +02:00
JC Brand
ffbacad969
Merge branch 'master' of github.com:jcbrand/converse.js
...
Conflicts:
converse.js
2013-02-21 14:46:05 +02:00
JC Brand
75b9a35e8d
Bugfix. Time on old messages shown incorrectly.
...
Also other backports from production.
2013-02-21 14:42:30 +02:00
JC Brand
1c7ef1917c
Merge pull request #1 from alecghica/master
...
Feature: added "Connecting to chat ..." info
2013-02-21 04:26:40 -08:00
Alexandru Ghica
53b2878405
Reverted cleanup made on Libraries/strophe.js
2013-02-21 11:39:38 +02:00
Alexandru Ghica
4bbf5b054d
Feature: added "Connecting to chat ..." info
...
- Feature: added spining image and "Connecting to chat ..." info under chat panel
when the user is not (yet) binded to the jabber server
[alecghica]
2013-02-20 18:21:07 +02:00
ichim-david
95fdf98ea6
Pass item to render method of RosterView instead of looping over each item on every render call, Inverted visibility logic for contact titles in order to avoid multiple show and hide
2013-02-20 15:36:55 +02:00
ichim-david
a875ba51a0
Moved assignment of template for RosterView out of the render method to avoid calling empty and readding items everytime the render method is called
2013-02-19 18:16:05 +02:00
JC Brand
3224a8c522
Add underscore as a dependency and use it and jQuery
...
This has fixed some IE8 errors while parsing the presence stanza
2012-12-11 16:31:39 +02:00
JC Brand
aad263868a
Fixed JSLint warnings
2012-12-11 15:21:56 +02:00
JC Brand
dbf20052c3
console can be defined higher up
2012-12-11 13:45:25 +02:00
JC Brand
d38af7ed89
Also handle case where AMD is not present
2012-12-11 13:45:08 +02:00
JC Brand
cc99f4f989
Cleanup and indented. Add AMD/global registrations
2012-12-11 13:41:48 +02:00
JC Brand
9ef94886db
IE8 fixes. Also avoid ajax call when opening chatroom
2012-12-11 12:02:46 +02:00
JC Brand
f968f56eb5
Bugfix. Use object vars instead of prototype vars.
2012-12-10 18:11:02 +02:00
JC Brand
6a49090a21
Use switch statement instead of ifs
2012-12-10 18:11:02 +02:00
JC Brand
fcb0b7bb57
Add TODO file
2012-12-09 21:50:05 +02:00
JC Brand
8bb1ee06b6
Refactored RosterView
...
So that it doesn't depend on it's element already being in the DOM
2012-12-09 21:47:12 +02:00
JC Brand
f699fbdbf5
Bugfix. Revert RosterView to previous module where it was executed in delayed fashion
2012-12-09 21:13:17 +02:00
JC Brand
39c0823f2a
Alphabetically sort roster contacts according to type and status
...
Also added a new jasmine spec for this as well as jquery.tinysort to do the
sorting.
2012-12-09 19:55:23 +02:00
JC Brand
624ab458d0
Improve suite names. Use toMatch matcher
2012-12-09 19:54:26 +02:00
JC Brand
85e419afc5
Add test.html for loading tests in browser and tests_main.js for calling them
...
Also add flush method to converse.js (used in ClientStorage tests)
2012-12-08 07:24:34 +02:00
JC Brand
da71c0b7f2
Add jasmine.js 1.3.1
2012-12-08 07:24:05 +02:00
JC Brand
0edc57107d
Add spec dir with jasmine.js test for ClientStorage
2012-12-08 07:22:40 +02:00
JC Brand
1cdf82c01a
Add /help command for chat and groupchat and /clear command for chat
2012-12-06 15:33:43 +02:00
JC Brand
f1bfc51152
Separate messages from different days.
2012-12-06 12:49:03 +02:00
JC Brand
7ae4bed223
IE 8 Fix. Add toISOString method
2012-11-20 15:08:29 +02:00
JC Brand
fc702d34e9
Make users listed in the chatroom smaller
2012-11-20 15:08:09 +02:00
JC Brand
fb03ea8a56
Handle case where console is undefined, like on IE
2012-11-20 13:53:04 +02:00
JC Brand
9abb9e36bf
Add logging submodule (from Patternslib)
2012-11-20 13:26:45 +02:00
JC Brand
c17ffdb98a
Added functionality to connect to an XMPP server.
...
Can succesfully connect now, but still need to get rid of ajax calls to @@xmp-userinfo, and replace them with
VCards.
2012-11-20 13:23:03 +02:00
JC Brand
aecc9942fc
Add jquery UI 1.9.1
2012-11-20 13:22:16 +02:00
JC Brand
4f9384cd51
Make image urls relative
2012-11-20 11:24:17 +02:00
JC Brand
bc4a242898
Automatically convert URLs in chat messages to hyperlinks
2012-11-20 10:57:24 +02:00
JC Brand
a723a3940b
Bugfix. Use findItem instead of get to check the roster
2012-11-20 09:32:12 +02:00
JC Brand
c8e6f53e3f
Remove require.js stuff (we'll have to use shims) and update to newest versions
2012-11-20 09:30:54 +02:00
JC Brand
ba201a7608
Don't connect to groupchat via first name only
2012-11-19 22:22:25 +02:00
JC Brand
36491699ee
If another resource changes it's status, change this one as well.
...
This is necessary because each open tab in the browser is its own resource.
TODO: Ideally we should differentiate between resources in the browser (using
converse.js) and other resources (i.e from a desktop client).
2012-11-04 20:28:25 +02:00
JC Brand
e213d755ae
Two small bugfixes
2012-11-04 20:02:06 +02:00
JC Brand
d0dc83ed30
XEP-0297: Forward sent messages to connected resources.
...
- This allows multiple open tabs (which is each its own resource) to be aware
when one tab sent a message.
2012-11-04 10:54:01 +02:00
JC Brand
8c7806425d
Work around undefined jarnxmpp for now. Properly define underscore.string
2012-11-02 13:55:12 +02:00
JC Brand
ac07c013af
update readme
2012-11-02 13:50:04 +02:00
JC Brand
dce8804e25
Merge branch 'master' of https://github.com/jcbrand/converse.js
2012-11-02 13:46:50 +02:00
