Commit Graph

2892 Commits

Author SHA1 Message Date
JC Brand
2083413431 Update changelog and small fixes to coding style guide 2015-10-24 20:46:57 +00:00
JC Brand
a1a89f7c0f Merge pull request #506 from rrjanbiah/master
Fixes #502. Chat room not opened in non_amd version.
2015-10-24 19:17:55 +02:00
R. Rajesh Jeba Anbiah
9e7280892f Merge pull request #1 from rrjanbiah/rrjanbiah-patch-1
Fixes #502. Chat room not opened in non_amd version.
2015-10-24 17:46:47 +05:30
R. Rajesh Jeba Anbiah
8113b24a79 Fixes #502. Chat room not opened in non_amd version. 2015-10-24 17:44:59 +05:30
JC Brand
d14cb4c14b Update changelog. 2015-10-22 10:39:36 +00:00
JC Brand
4c3273403e Merge pull request #505 from gromiak/master
Typo caused [object Object] in room info
2015-10-22 12:37:09 +02:00
Władysław Koszałko
6e6f852a9b Typo caused [object Object] in room info 2015-10-22 12:28:00 +02:00
JC Brand
cf25670ccb Merge pull request #503 from teseo/master
Fix roster push when new contact is pushed from server and emit rosterPush event
2015-10-20 14:04:50 +02:00
Javier Mellado
bef4e26a4b Better writing. 2015-10-20 11:04:15 +01:00
Javier Mellado
b6d463b214 Update development.rst
remove capital letter.
2015-10-20 11:02:42 +01:00
Javier Mellado
5f27e25648 Better writing. 2015-10-20 11:01:05 +01:00
Javier Mellado
3142ebbb6b Force type comparison and documentation updates 2015-10-20 10:57:21 +01:00
Javier Mellado
4fb99c0c2a Fix roster push when new contact is pushed from server and emit rosterPush event 2015-10-19 14:52:49 +01:00
JC Brand
b7ea4c29cd Better solution for roster contacts scrolling. 2015-10-16 16:01:39 +00:00
JC Brand
d8a9dd5acf Work around a IE10 bug.
IE 10 doesn't appear to properly handle calc(100% - 26px), breaking scrolling
of contacts.
2015-10-16 14:42:45 +00:00
JC Brand
f2edf0de38 Remove text in links.
Didn't intend to commit and still need to do properly.
2015-10-16 14:28:35 +00:00
JC Brand
8b20394560 CSS improvements.
- Last pending contact was being obscured/overflowing
- Select box for filtering was not aligned
2015-10-16 14:12:10 +00:00
JC Brand
af77b3189e New release: 0.9.6 2015-10-12 15:09:47 +00:00
JC Brand
6344703cb8 Merge pull request #500 from 1st8/master
Fix #467
2015-10-12 16:53:23 +02:00
JC Brand
81391ff4a2 Ensure that tests execute with 'en' locale. refs #501 2015-10-12 14:43:20 +00:00
JC Brand
12d6785d02 Fixes #472 Cannot read property 'splitOnce' of undefined 2015-10-12 14:24:22 +00:00
JC Brand
7d1fc391ac Don't attempt to fetch archived messages if not supported
by the server. Otherwise we get a spinner that doesn't disappear.
2015-10-12 13:22:06 +00:00
Christoph
e20018961f Fix outgoing chat messages not having a msgid when being put into sessionStorage, fixes #467 2015-10-12 11:06:12 +02:00
JC Brand
57a309177f Fix link to prosody.im 2015-10-08 12:11:48 +00:00
JC Brand
e3cb6f3fc7 Use .bind instead of $.proxy 2015-10-07 09:05:53 +00:00
JC Brand
eeb8210ff6 Fixes #496. Bind converse to this in callback. 2015-10-07 08:07:05 +00:00
JC Brand
795d5fb6fd Merge branch 'master' of github.com:jcbrand/converse.js 2015-10-07 08:04:28 +00:00
JC Brand
0d9d632f40 Bugfix for #493 2015-09-30 21:04:37 +02:00
JC Brand
414265299a Drop dragresize-tm class. Don't set height if not available 2015-09-24 13:55:48 +00:00
JC Brand
a9c2b7d99f Remove the default_box_size setting.
Instead, get the height from how it's rendered in the browser (i.e. from CSS)
2015-09-24 13:52:35 +00:00
JC Brand
f3e2de9945 Document allow_dragresize option. 2015-09-22 12:40:08 +00:00
JC Brand
586c9797c6 Merge pull request #473 from GreenLunar/patch-1
Update Hebrew translation
2015-09-18 14:51:16 +02:00
GreenLunar
4f99e9f906 Update Hebrew translation 2015-09-18 15:47:03 +03:00
JC Brand
64878ec6e0 Merge pull request #468 from 1st8/master
Fix [object Object] being sometimes shown as status
2015-09-09 14:16:05 +02:00
Christoph Geschwind
1463e7cc33 Update CHANGES.rst 2015-09-09 13:25:53 +02:00
Christoph
12da915ef8 Fix [object Object] being shown as status when other presence stanza with custom 'status' is received from other resource 2015-09-09 13:19:26 +02:00
JC Brand
0d4cf15f0e Move changelog entry to right version and add test case. 2015-09-09 10:17:46 +02:00
JC Brand
5cb7ca025f Merge pull request #462 from 1st8/master
Fix #461: MUC working with spaces etc. in room names
2015-09-09 09:50:06 +02:00
JC Brand
c3e5bdc644 Merge pull request #465 from hjbolide/master
Fix translation error in en locale
2015-09-05 14:31:05 +02:00
Charles Huang
d9679ce45f Fix translation error in en locale
- fix incorrect string mapping in en locale
2015-09-05 22:25:37 +10:00
Christoph Geschwind
d08ce409c8 Add #462 to CHANGES.rst 2015-09-04 13:26:33 +02:00
Christoph
19ef0f8c71 Fix #461: MUC working with spaces etc. in room names 2015-09-03 16:19:06 +02:00
JC Brand
c9b0d4c86a Merge pull request #458 from 1st8/master
Fix no messages being shown in chat
2015-09-01 14:46:30 +02:00
Christoph
73fa397c77 Fix no messages being shown in chat (first_msg_date is null, code checked for undefined only)
Maybe related to message archive feature or different jQuery version
2015-09-01 13:41:16 +02:00
JC Brand
d8a325789e Bump version of Strophe.js so that we get the new UUID generator 2015-08-31 09:17:12 +02:00
JC Brand
2fee83e125 Merge pull request #457 from camaran/patch-2
update italian language
2015-08-30 12:28:32 +02:00
camaran
2178822e97 update italian language 2015-08-29 21:30:01 +02:00
JC Brand
ce222e5b75 Small improvements to theming page and tweak css. 2015-08-29 11:51:41 +02:00
JC Brand
de9d8625ea Use released version of backbone.overview 2015-08-26 14:34:16 +02:00
JC Brand
0672e84990 Correctly place config setting in right order. 2015-08-24 18:42:08 +02:00