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

1699 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
cdb86788a3 Fix tests. 
In the previous commit, the mock connection object was refactored to use a real
Strophe.Connection object.

This caused a test in spec/controlbox.js to fail (due to a method that was now
no longer mocked).

Added a quick workaround (via monkeypatch) for now.
 2014-10-24 21:45:48 +02:00
JC Brand
5e4d6bd3b2 Initial work on adding profiling tests. 2014-10-24 18:58:42 +02:00
JC Brand
7e42783c62 Don't remove requesting users when clearing the roster cache. updates #262 2014-10-24 18:55:32 +02:00
JC Brand
0963f5c4d5 Add 'override' method for overriding converse Views and Models. 2014-10-22 22:17:21 +02:00
JC Brand
8dedef7002 Create new PO file for Polish. 
Also update documentation to mention msginit.
 2014-10-21 13:18:26 +02:00
JC Brand
bb54874f35 Add extra check before accepting a passed in connection. 
No use in using a passed in connection that's not connected.
 2014-10-19 20:41:16 +02:00
JC Brand
aa2c38548c Tweak participants' toggle so that widths don't need to be hardcoded. 2014-10-19 15:09:29 +02:00
JC Brand
35928308c8 Bugfix. "ev" isn't necessarily defined. 2014-10-15 22:56:45 +02:00
JC Brand
80b8fed6cd New method createChatRoomMessage 2014-10-15 22:28:43 +02:00
JC Brand
b93d43d2cb Also store message id for received messages. updates #240 2014-10-15 19:51:30 +02:00
JC Brand
a717cc464a bugfix. msgid should be string. 2014-10-15 19:35:03 +02:00
JC Brand
4a89d28e38 Fix tests by depending on jquery obj. 
Also fixed groupchat test by getting and including correct msg id.
 2014-10-15 19:16:02 +02:00
JC Brand
a88c786991 Instead of using a hash, use milliseconds since epoch for groupchat id. 
That way, if need be, we could sort messages.
 2014-10-15 19:15:28 +02:00
JC Brand
c7abf54359 Merge branch 'private-jquery' of github.com:jcbrand/converse.js into private-jquery 2014-10-15 18:43:27 +02:00
JC Brand
5b17becfad Use newest strophe.muc.js and use strophejs-plugins bower resource where possible. 2014-10-15 18:37:41 +02:00
JC Brand
55c57a346d Move translation factory to utils 
So that it can be used by plugins.
 2014-10-13 22:02:55 +02:00
JC Brand
970da2acf0 Keep track of groupchat messages... fixes #240 
by way of msgid attribute.
 2014-10-13 21:15:25 +02:00
JC Brand
24cd78a78d Call plugins after Backbone models and views have been parsed. 2014-10-12 16:24:57 +02:00
JC Brand
490f26031e Add registerPlugin API method. 2014-10-12 14:49:45 +02:00
JC Brand
1955c611e1 Merge branch 'master' into private-jquery 2014-10-12 11:37:35 +02:00
JC Brand
60367f82f7 Bugfix. Proxy methods to ensure proper context. updates #46 2014-10-12 11:11:28 +02:00
JC Brand
4bcf26114c Add docs for the 2 new API methods. updates #46 2014-10-12 11:03:35 +02:00
JC Brand
48dd0cc674 Trying to organize doc chapters a bit more logically. 2014-10-12 11:03:25 +02:00
JC Brand
5b46e27c41 Add 2 new API methods. updates #46 
Added openChatBox and getChatBox.
 2014-10-12 10:34:33 +02:00
JC Brand
8493b4f423 Add space between function name and brackets 
to visually differentiate between function declarations and instantiations.
 2014-10-10 11:05:16 +02:00
JC Brand
bfc747b4fc Merge branch 'master' into private-jquery 2014-10-10 10:53:41 +02:00
JC Brand
266f3da2f7 Close ul tag. 2014-10-10 10:53:16 +02:00
JC Brand
eaa18cc4c2 Merge branch 'master' of github.com:jcbrand/converse.js 2014-10-10 10:52:41 +02:00
JC Brand
a5cc9905c4 Merge pull request #248 from sir-sigurd/index 
index.html: markup fix
 2014-10-10 10:52:17 +02:00
JC Brand
ab8ec3c43c Merge pull request #247 from sir-sigurd/fix-prebind-reference-error 
fix prebind reference error
 2014-10-10 10:49:50 +02:00
JC Brand
a47352e760 Merge pull request #249 from sir-sigurd/template-fixes 
templates: close li tags
 2014-10-10 10:49:08 +02:00
Sergey Fedoseev
ea641607e3 templates: close li tags 2014-10-10 14:35:14 +06:00
Sergey Fedoseev
a46cd044c9 index.html: markup fix 2014-10-10 14:24:31 +06:00
Sergey Fedoseev
6e0c173f44 fix prebind reference error 2014-10-10 02:03:23 +06:00
JC Brand
e8d3b94420 Merge pull request #246 from sir-sigurd/fix-restore-event-prevention 
fix event prevention on chat restore
 2014-10-09 17:05:58 +02:00
Sergey Fedoseev
6addfdabb0 fix event prevention on chat restore 2014-10-09 20:32:24 +06:00
JC Brand
946801581e Merge pull request #243 from sir-sigurd/master 
login_panel.html: remove useless quote character
 2014-10-08 09:43:46 +02:00
Sergey Fedoseev
642302ad60 login_panel.html: remove useless quote character 2014-10-08 01:04:51 +06:00
JC Brand
d6110a1e52 Patch all scripts that rely on jquery to be AMD compatible. 2014-10-07 18:17:19 +02:00
JC Brand
85f8624087 Use patched jquery.browser. 2014-10-06 21:27:06 +02:00
JC Brand
f7c943549b otr.js also has jquery.browser as dependency 2014-10-06 21:10:35 +02:00
JC Brand
6b2dd9b3cb Update build files and created new builds. 2014-10-06 21:10:07 +02:00
JC Brand
f2e42b4111 otr.js also has jquery.browser as dependency 2014-10-06 20:58:54 +02:00
JC Brand
9215c6dde9 Use jQuery obj from converse and use dev files 2014-10-06 20:44:55 +02:00
JC Brand
0c144d020a remove all jquery shims and map to private jquery 2014-10-06 20:44:51 +02:00
JC Brand
127c4d9662 Merge branch 'private-jquery' 2014-10-06 20:40:52 +02:00
JC Brand
99f3fd30ca Add jquery-private to require config and remove unnecessary shims 2014-10-06 20:38:34 +02:00
JC Brand
0c83ac4524 Explicitly set jQuery as a dependency of converse.js 
Also in utils.js and otr.js (this will help reach to goal of having a private
jquery which doesn't pollute the global $ var).
 2014-10-06 20:23:59 +02:00
JC Brand
72753e209c Merge pull request #241 from sir-sigurd/master 
index.rst: change duplicated `allow_muc` to `allow_otr`
 2014-10-01 11:00:57 +02:00
Sergey Fedoseev
adbcf01a98 index.rst: change duplicated allow_muc to allow_otr 2014-10-01 14:01:45 +06:00