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 |
|
JC Brand
|
d54e3b962c
|
Merge branch 'master' of github.com:jcbrand/converse.js
|
2014-09-22 16:41:57 +02:00 |
|
JC Brand
|
77dda059c6
|
Merge pull request #227 from GreenLunar/master
Hebrew translation update
|
2014-09-22 16:41:51 +02:00 |
|
JC Brand
|
5bc1286a64
|
Take <gone> chat state into consideration.
|
2014-09-22 16:35:36 +02:00 |
|
JC Brand
|
7cf8dc6bee
|
Fixed Non-AMD example. fixes #220
|
2014-09-22 16:10:20 +02:00 |
|
JC Brand
|
6b4b94d45f
|
RestructuredText markup error fixed. updates #187
|
2014-09-22 15:07:50 +02:00 |
|
JC Brand
|
82617918b1
|
Add API section to docs and regenerate.
|
2014-09-22 15:04:28 +02:00 |
|
JC Brand
|
8843910d52
|
Add API method to retrieve buddy attributes. fixes #223
|
2014-09-22 15:03:57 +02:00 |
|
JC Brand
|
46400efa97
|
Markup fix
|
2014-09-22 13:16:43 +02:00 |
|
JC Brand
|
297259fdb7
|
Remember toggle state of control box. updates #222
|
2014-09-22 13:08:56 +02:00 |
|
JC Brand
|
21d965564f
|
fix markup syntax err and enable minified js
|
2014-09-21 19:05:19 +02:00 |
|
JC Brand
|
b241f8c64e
|
Add new font set with an icon for converse.js
and one for logging out. Also added a favicon.
|
2014-09-21 18:58:36 +02:00 |
|
JC Brand
|
7b6dfff99d
|
Fix tests.
Elements in chat rooms are now hidden, instead of removed. Update tests to
reflect this.
|
2014-09-21 00:47:36 +02:00 |
|
JC Brand
|
090888ad99
|
Use newer version of strophe.muc.
|
2014-09-21 00:20:10 +02:00 |
|
JC Brand
|
e860343eb2
|
Bugfix. The chatroom was being joined twice, causing duplication.
|
2014-09-21 00:19:59 +02:00 |
|