Commit Graph

2304 Commits

Author SHA1 Message Date
JC Brand
fc95622d72 Fix path to js file in non_amd.html 2015-06-22 22:28:31 +02:00
JC Brand
c745e1ebff Cherry-pick only those languages from Moment which we support in converse.js 2015-06-22 22:20:02 +02:00
JC Brand
98f6ea8a3f Merge pull request #428 from thierrytiti/chat-with-pending
Enhancement #394 Option to allow chatting with pending contacts
2015-06-22 21:30:24 +02:00
JC Brand
0c67d2117b Bugfix. Just return locale string id. 2015-06-22 20:31:51 +02:00
JC Brand
346a2552cb Provide links to @fpytloun's Django repo. 2015-06-22 20:04:08 +02:00
JC Brand
e999f2c6df Merge branch 'i18n-momentjs' of https://github.com/thierrytiti/converse.js into thierrytiti-i18n-momentjs
Conflicts:
	converse.js

Also refactored the code to adhere to the style guide.
2015-06-22 19:54:51 +02:00
JC Brand
56cd540f5d Update changelog after merge. 2015-06-22 18:55:02 +02:00
JC Brand
ed3be3730c Merge branch 'master' of github.com:emmanuel-florent/converse.js into emmflorent 2015-06-22 18:51:12 +02:00
JC Brand
21a3b44050 Don't send CSI or auto_away/xa stanzas when not auth'd
This is to deal with reconnects. Originally @thierrytiti checked for
`connection.connected` but I think that might still pose a problem when
reconnecting is in process and the user is not yet authenticated again.

This makes pull request #426 unnecessary.
2015-06-22 18:39:12 +02:00
JC Brand
952b5098cd Small improvements to quickstart text. 2015-06-22 14:47:53 +02:00
JC Brand
868435173f Decouple automatic away and XEP-0352 support.
- Add new config option csi_waiting_time for CSI support.
- The auto_away and auto_xa options won't send out CSI stanzas if csi_waiting_time is 0
- Update docs and add tests for both features.
2015-06-22 00:01:31 +02:00
JC Brand
7551c629bd Rely on Strophe's keepalive function instead of our own.
I recently added keepalive functionality to Strophe, similar to what was
already in converse.js. It's stable enough now that we can rely on it
instead.
2015-06-19 18:01:42 +02:00
JC Brand
66386d5b25 Rely on "pagehide" first if it's available.
This is because "pagehide" is fired in more situations and because unload
is not supported on mobile Safari.
2015-06-19 18:00:22 +02:00
JC Brand
c47c8bd7eb Use "strict" mode again and fix styling.
We "use strict" outside of the function that gives issues on Safari.
2015-06-19 17:58:28 +02:00
JC Brand
19065e62b6 Update the style guide. 2015-06-19 17:54:49 +02:00
thierrytiti
479bab2ce4 Enhancement #394 Option to allow chatting with pending contacts 2015-06-18 16:31:30 +02:00
eflorent
fdfd98ac82 Fix simple type on variable name closes #427
At some point an improbable condition reached a typographic error.
2015-06-16 21:03:57 +00:00
JC Brand
785244f15e Add a styleguide to the documentation.
Also update the contributor guidelines to mention the styleguide.
2015-06-16 00:20:28 +02:00
JC Brand
36120cd7b2 Document clean command 2015-06-16 00:20:28 +02:00
JC Brand
90492df100 Merge pull request #425 from 1st8/master
Hide server label in room panel when input is hidden
2015-06-11 16:25:37 +02:00
Christoph
8f7f3e323c Hide server label in room panel when input is hidden by hide_muc_server=true config 2015-06-11 15:06:11 +02:00
JC Brand
ae272611fb Merge pull request #424 from 1st8/master
Small german locale improvements
2015-06-11 10:09:02 +02:00
Christoph
09241fc7ec Translations from po but missing in json 2015-06-11 09:40:54 +02:00
Christoph
f57a24487e Fix unused placeholders in german 'is typing' translation 2015-06-11 09:40:19 +02:00
JC Brand
9a2ed106c7 Bugfix. Don't reconnect when disconnect was due to auth err. 2015-06-07 18:29:36 +02:00
JC Brand
94514dfe1e Attempt to reconnect only after 5 seconds. 2015-06-07 18:26:32 +02:00
JC Brand
d6bb3f8502 Small changes to connection status handler.
* Rename onConnStatusChanged to onConnectStatusChanged
* Provide human readable debug feedback on onConnectStatusChanged
2015-06-07 18:23:29 +02:00
JC Brand
f86ef934e8 Refactor the session resumption code and fix a bug after recent merge.
Split the code into two new methods for the prebind and non-prebind
usecase.
2015-06-05 14:48:16 +02:00
JC Brand
085d91b546 Provide support for browsers which don't have beforeunload event. 2015-06-05 14:48:16 +02:00
JC Brand
8616af418a Add more Sass variables. 2015-06-05 14:48:16 +02:00
JC Brand
a3201d79c3 Merge pull request #422 from 1st8/master
More small improvements to german locale
2015-06-05 13:46:55 +02:00
Christoph
6940f5e290 More small improvements to german locale 2015-06-05 12:51:23 +02:00
JC Brand
aa9a96b691 Split sass files up into includes and update some Ruby dependencies.
Also fixed a CSS bug. Chat box's width wasn't responsive.
2015-06-04 15:07:03 +02:00
JC Brand
b7761ea169 Sort changes, add issue numbers and add entry...
mentioning plugins architecture refactoring.
2015-06-04 12:23:11 +02:00
JC Brand
334f095774 Merge branch 'master' into plugins-refactor 2015-06-04 12:11:56 +02:00
JC Brand
712ddb0fca Updates to DE translations. Updates #420 2015-06-04 10:12:20 +02:00
JC Brand
92f744772b Merge pull request #420 from 1st8/master
Improve de locale
2015-06-03 17:13:29 +02:00
Christoph
8ce4f15a4e Improve de locale 2015-06-03 14:07:04 +02:00
JC Brand
e747b944c0 Use SPDX license expression syntax. Fixes #419. 2015-06-03 09:55:19 +02:00
JC Brand
b366bf309b Add Gemfile.lock 2015-06-02 12:03:00 +02:00
JC Brand
d0a0c7f79a The dev-ruby target is replaced with stamp-bundler. 2015-06-01 22:32:25 +02:00
JC Brand
217f3255f7 Sorted the latest changes and combine some. 2015-05-31 14:52:18 +02:00
JC Brand
a77744d867 Two trimChats bugfixes. See below.
- TrimChats was called before a newly maximized chat had its final width which
  prevented it from working as intended.
- We cannot check for available space by using the width of the #conversejs
  element anymore, since it now has variable (auto) width. So we check against
  the body width instead.
2015-05-31 14:50:41 +02:00
JC Brand
f4edf75c72 Bugfix. Fetched chat boxes weren't being shown automatically. 2015-05-31 14:46:12 +02:00
JC Brand
bf61122805 Avoid trying to retrieve non-existing models. fixes #415 2015-05-31 14:39:28 +02:00
JC Brand
e3f20bf1ad Reduce the rightmost margin to 15px instead of 30px. 2015-05-31 13:18:57 +02:00
JC Brand
2ee691fc1f Merge branch 'thierrytiti-icomoon-xa-icon' 2015-05-29 12:00:29 +02:00
JC Brand
15e5df74e0 Merge branch 'icomoon-xa-icon' of https://github.com/thierrytiti/converse.js into thierrytiti-icomoon-xa-icon 2015-05-29 12:00:14 +02:00
JC Brand
7481fab034 Merge branch 'thierrytiti-MUC-toggle-Call' 2015-05-29 10:12:52 +02:00
JC Brand
a412bd92c4 Merge branch 'MUC-toggle-Call' of https://github.com/thierrytiti/converse.js into thierrytiti-MUC-toggle-Call 2015-05-29 10:12:40 +02:00