Commit Graph

1638 Commits

Author SHA1 Message Date
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
Sergey Fedoseev
0c840aa8d4 index.rst: remove trailing spaces 2014-10-01 14:01:40 +06:00
JC Brand
5bad6b02b6 Clarify how one should use prebind and keepalive together. 2014-09-30 12:27:53 +02:00
JC Brand
64847bcb96 Add new event noResumeableSession 2014-09-26 17:20:52 +02:00
JC Brand
c71b03094d Move website specific code out of main.js and into index.html. updates #229
Otherwise, we get errors "Cannot read property top of undefined".
2014-09-26 11:33:47 +02:00
JC Brand
5a5d3d85b6 Add logos files 2014-09-26 11:29:17 +02:00
JC Brand
b803267555 Bugfix. Return after attaching with prebind data. 2014-09-24 10:57:07 +02:00
JC Brand
d8bf1961a7 Making a 0.8.3 release.
The 0.8.2 release didn't include new builds due to an unnoticed build error.
2014-09-22 18:17:40 +02:00
JC Brand
05d58f1d29 Wrong minor release num 2014-09-22 18:01:08 +02:00
JC Brand
56ec4cf7bc New release 0.8.2 2014-09-22 17:57:56 +02:00
JC Brand
d4281c6134 Remove some redundant intialization settings. 2014-09-22 17:23:21 +02:00
JC Brand
072f9e8534 Add updated hebrew translations. 2014-09-22 17:06:22 +02:00