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

485 Commits

Author SHA1 Message Date
JC Brand
d53caf115a Make sure presence stanza is sent out after roster update 
specifically also when localstorage is populated
 2013-10-15 18:29:16 +02:00
JC Brand
b6a6562de9 Merge branch '0.6.x' 
Conflicts:
	Makefile
	converse.css
	converse.min.css
	converse.min.js
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js
 2013-10-08 22:12:12 +02:00
JC Brand
f68712a58c Bugfix. Presence stanza sent out before roster initialized 2013-10-08 22:10:00 +02:00
JC Brand
8a2e4e83e7 Remove getItem. 
It's a relic from a time before the class subclassed a Backbone.Collection
 2013-10-08 08:45:17 +02:00
JC Brand
a3dc23bf3e Bugfix. When trying to reconnect: 'connection' is not defined. 
Conflicts:
	converse.js
 2013-10-07 21:36:50 +02:00
JC Brand
b943d4ca35 Bugfix. When trying to reconnect: 'connection' is not defined. 2013-10-07 21:35:52 +02:00
JC Brand
e883d137fc Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect. 
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
 2013-10-07 09:16:26 +02:00
JC Brand
4f44be9e29 Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html
 2013-10-07 09:16:02 +02:00
JC Brand
18091308be Bugfixes. RosterItemView didn't rebind events. Undefined vars in onConnect. 
When using show_only_online_users, roster item DOM elements are removed from
the DOM if their status changed from 'online' to something else.

When their status changed to 'online' again, they were re-added.

Their views (RosterItemView) instances however didn't listen to events anymore.

Calling delegateEvents on the view after calling $.remove() fixed this.
 2013-10-07 09:13:16 +02:00
JC Brand
37f2f8ca0c Merge branch '0.6.x' 
Conflicts:
	converse.js
 2013-10-05 23:11:17 +02:00
JC Brand
3bf27e8b5f New config option `show_only_online_users` 
If true, only users with a status of 'online' will be shown in the contacts
roster.
 2013-10-05 23:07:42 +02:00
JC Brand
b111e60c1d Merge branch '0.6.x' 
Conflicts:
	converse.js
 2013-10-05 22:38:14 +02:00
JC Brand
fcc1f5adf4 A bit of reordering. 
Move all module-level functions/variables and Backbone Modules/Views together.
Add headings to indicate logical sections.
Make statuses variable module-level and indicate that it's a constant (all caps)
 2013-10-05 22:34:47 +02:00
JC Brand
ef1c834090 Don't check for allow_contact_requests in RosterItemView render method 
This method shouldn't be called when contact requests aren't allowed because
roster items are then not created for contact requests.
 2013-10-05 22:16:09 +02:00
JC Brand
0752a0e2ed Merge branch '0.6.x' 
Conflicts:
	converse.min.css
	converse.min.js
 2013-10-05 16:50:26 +02:00
JC Brand
feda94178c Refactor incoming subscription handling code into its own method 2013-10-05 16:46:57 +02:00
JC Brand
3a1bd7c4e6 Remove duplicate allow_muc and sort 2013-10-03 19:01:58 +02:00
JC Brand
646fcb36c7 Merge branch '0.6.x' 2013-10-03 18:52:39 +02:00
JC Brand
a5b5e7538f 2 Bugfixes. 
- Register handlers that depend on the roster inside initRoster and the
  message handler inside chatboxes.onConnected. This solves problem of presence
  stanzas being received before handlers are initialized. Updates #65

- Check if MUC is allowed during feature discovery
 2013-10-03 18:43:49 +02:00
JC Brand
cf137c607b Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html
 2013-10-03 16:05:21 +02:00
JC Brand
7f371b883e Add config option `allow_contact_requests` to toggle user adding 2013-10-03 15:58:09 +02:00
JC Brand
b8e096ffd1 Merge branch '0.6.x' 
Conflicts:
	converse.js
	index.html

Add config option ``allow_contact_requests`` to toggle user adding
 2013-10-03 14:25:39 +02:00
JC Brand
a57d0e9818 Sort default values 2013-10-03 14:24:23 +02:00
JC Brand
0d6e29f067 Add config option `allow_contact_requests` to toggle user adding 2013-10-03 14:22:33 +02:00
JC Brand
e4c9fcbc4e Merge branch '0.6.x' 
Conflicts:
	converse.css
	converse.js
	index.html

Add allow_muc config option
 2013-10-03 13:53:47 +02:00
JC Brand
7f4bdb4098 Don't use id for controlbox panes 2013-10-03 13:45:50 +02:00
JC Brand
feaff64aab Add setting to enable/disable MUC 2013-10-03 13:16:26 +02:00
JC Brand
8f14c32b48 Use newest (unreleased) otr.js so that we can specify paths ourselves 2013-10-03 10:18:07 +02:00
JC Brand
e4a1ccf1c0 Remove old classes before adding new ones. Updates #38 2013-09-26 21:48:45 +02:00
JC Brand
122cb937fe Fetch vCard once a roster contact is added. Updates #38 
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
 2013-09-26 21:48:44 +02:00
JC Brand
3dfcd3c04a Remove old classes before adding new ones. Updates #38 2013-09-26 21:46:10 +02:00
JC Brand
b36e6bbce1 Fetch vCard once a roster contact is added. Updates #38 
This will happen in the background and in the meantime roster contacts will
appear under their JIDs.
 2013-09-26 11:53:47 +02:00
JC Brand
1d14a2b950 Use const for enter key 2013-09-18 09:25:40 +02:00
JC Brand
367803d6ef The xa chat state wasn't being handled properly 2013-09-13 10:58:00 +02:00
JC Brand
59fc3182b1 The xa chat state wasn't being handled properly 2013-09-13 10:57:28 +02:00
JC Brand
b34a706132 We didn't have an icon for unavailable state. 
Also, the status description was not translation aware
 2013-09-13 10:35:37 +02:00
JC Brand
8977505f11 We didn't have an icon for unavailable state. 
Also, the status description was not translation aware
 2013-09-13 10:35:00 +02:00
JC Brand
f15eb5a7d4 Remove messages from localStorage when calling /clear 2013-09-13 09:59:06 +02:00
JC Brand
0dd4b3e52c Remove messages from localStorage when calling /clear 2013-09-13 09:57:14 +02:00
JC Brand
d402ed8e8e Merge branch 'master' into otr 
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
 2013-09-12 20:57:51 +02:00
JC Brand
37f3a95a20 For uniqueness, we need both JIDs for messages localStorage Fixes #49 2013-09-12 15:30:09 +02:00
JC Brand
4ab6f28181 Bugfix. Messages were stored against buddy JID and not own JID 2013-09-12 15:24:56 +02:00
JC Brand
9734ccdeff The word 'me' wasn't translation aware. 
Conflicts:
	locale/converse.pot
 2013-09-12 08:37:41 +02:00
JC Brand
00cb015d6a Merge branch 'master' into otr 
Conflicts:
	converse.js
 2013-09-10 23:33:30 +02:00
JC Brand
778b8a7c2e The word 'me' wasn't translation aware. 2013-09-10 23:31:29 +02:00
JC Brand
4bb22b5c97 Translated strings may not be broken up. Regenerated POT file 2013-09-10 22:52:15 +02:00
JC Brand
1574acb37b Save the private key and instance tag in session storage. 2013-09-10 22:37:12 +02:00
JC Brand
9967b955c8 Show an alert before generating private key 
To make it clear to the user that the browser might freeze up while generating
the key.
 2013-09-08 18:13:49 +02:00
JC Brand
36c2a2ac45 Add option to hide the toolbar 2013-09-08 16:56:38 +02:00
JC Brand
ac3ac98c59 Allow chat statuses to be translated. 
Add conf setting for allowing OTR.
 2013-09-08 16:39:46 +02:00
JC Brand
a092d6e440 Updates #47 
Mention FR translations.
Make sure "... is typing" gets translated.
 2013-09-03 12:30:56 +02:00
JC Brand
3b62580ccd Don't use ids for the login form inputs 2013-09-02 11:48:09 +02:00
JC Brand
e2c97e389f Add allow_otr option (doesn't nothing yet) 2013-09-02 11:30:54 +02:00
JC Brand
a50e2d73e5 Various bugfixes after testing OTR converse2converse 
Previously only tested pidgin2converse
 2013-09-01 21:37:22 +02:00
JC Brand
2f7524f14f Only mention generation of key if it's actually happening. 2013-08-31 23:42:48 +02:00
JC Brand
4c1e0564f8 Nicer prompts for SMP authentication. 
Off-the-record is now functional and mostly done. Updates #11
 2013-08-31 23:20:07 +02:00
JC Brand
9add3e3d94 Add support for Socialist's Millionaire Protocol authentication 2013-08-31 22:30:34 +02:00
JC Brand
942d262622 Implement a check that the user's password is still the same 
before trusting the decrypted private key, otherwise generate a new one.
 2013-08-31 20:44:43 +02:00
JC Brand
3fbf572ac6 Bugfix. Plaintext msgs sent after OTR termination weren't saved 2013-08-31 17:43:38 +02:00
JC Brand
8e8987a877 Added a way to verify your buddies identity 
(by enabling fingerprint comparisons)
 2013-08-31 17:27:14 +02:00
JC Brand
7a31d8cae2 User can now end an encrypted session. 2013-08-31 16:06:47 +02:00
JC Brand
6ac24c3b31 Show many more info messages to inform user of OTR status 2013-08-31 15:45:23 +02:00
JC Brand
e8976dc448 More UI improvements. 
Don't show encrypted messages when we don't have an encrypted session set up on
our side (show error message instead).
 2013-08-31 15:00:04 +02:00
JC Brand
f0204dd54b Use class instead of id for controlbox-panes element 2013-08-31 14:29:58 +02:00
JC Brand
fcd488c452 Improved UI. The chat toolbar now gives better feedback. 2013-08-30 22:49:33 +02:00
JC Brand
ccfccfb2cf Handle case where buddy starts OTR better. 2013-08-30 21:18:46 +02:00
JC Brand
e4cf875d24 Merge branch 'master' into otr 
Conflicts:
	bower.json
	converse.css
	converse.js
	main.js
	tests_main.js
 2013-08-30 20:26:48 +02:00
JC Brand
42c3bc2b38 Bugfix. 
With auto_subscribe=True, "Pending Contacts" header didn't disappear
after user was added to the roster.
 2013-08-29 21:56:56 +02:00
JC Brand
9463778185 Some optimization changes. 
Don't sort roster contacts needlessly.
Don't call show() or hide() needlessly.
No need for setting a 'sorted' attr on the last item.
 2013-08-29 21:24:47 +02:00
JC Brand
c5e44a02fa Bugfix. The remove icon wasn't being shown for contacts. 2013-08-29 20:06:17 +02:00
JC Brand
1430689c43 Bugfix. Fall back to 'en' if non-existing locale was specified. 2013-08-28 00:47:14 +02:00
JC Brand
fd187533fd Add special option xhr_custom_status. 
Allows for sending the custom status to the server via ajax.
 2013-08-27 23:52:44 +02:00
JC Brand
e530094acc Update roster snippet to be same as mockup. 2013-08-27 11:19:18 +02:00
JC Brand
563987cf29 Include Jed for the nolocales option. 
We need variable sprintf type var interpolation
 2013-08-27 09:37:33 +02:00
JC Brand
5682473426 Whitelist jid, sid and rid as well. 2013-08-26 16:40:34 +02:00
JC Brand
9628189382 Can't call i18n.translate directly if we bundle without i18n support 2013-08-26 16:21:32 +02:00
JC Brand
1d6f2dbe5a Bugfix. i18n is attr, not variable. 2013-08-26 15:05:08 +02:00
JC Brand
d4502d6e6f As with localstorage, give tinysort it's full name 
(Aids with bungle integration)
 2013-08-26 14:45:24 +02:00
JC Brand
7b0e1d331b Working on a way to build converse without locales. 
- Add nolocales.js and let the __ function handle case where there aren't any
  locales specified.

Also:
In require config, change localstorage to backbone.localStorage (for better
integration with bungle).
 2013-08-26 14:37:35 +02:00
JC Brand
ef1a57c6d0 Bugfix. Pencil icon not visible (for setting status update). 2013-08-26 10:54:58 +02:00
JC Brand
a607e09eef Better textarea styling. Ensure all boxes are same height. 
Conflicts:
	converse.css
 2013-08-26 09:29:14 +02:00
JC Brand
2c0ae11fb7 Remove sjcl, which is not being used anymore 2013-08-25 23:27:07 +02:00
JC Brand
664e2090ba Add initial UI and handlers for starting OTR to converse.js 2013-08-25 22:10:32 +02:00
JC Brand
887d27ae59 Merge branch 'mockup' into otr 2013-08-25 14:32:36 +02:00
JC Brand
9c88aa1929 Better textarea styling. Ensure all boxes are same height. 2013-08-25 13:50:55 +02:00
JC Brand
921ae7ec7e More renamings/refactoring to add consistency 2013-08-25 12:17:46 +02:00
JC Brand
6a45eee6da Rename methods to trying and get some consistency. 2013-08-25 12:06:53 +02:00
JC Brand
044fb84c3a More work on Off-the-record support. Updates #11 
OTR key exchange now works and encrypted messages can be sent.
Lots of rough edges however and no proper UI.
 2013-08-24 23:11:22 +02:00
JC Brand
104f905641 Merge branch 'master' into otr 
Conflicts:
	docs/doctrees/index.doctree
	docs/html/index.html
	docs/html/searchindex.js
 2013-08-24 16:34:07 +02:00
JC Brand
7e854edb48 Make sure to show the submit button if connecting failed 2013-08-24 16:11:08 +02:00
JC Brand
810f5dec95 Merge branch 'sane-mockup' 
Conflicts:
	docs/html/searchindex.js
	index.html
 2013-08-24 15:44:58 +02:00
JC Brand
4bc2b7227f Fixed tests initialization (broken during recent refactor) 2013-08-24 03:10:06 +02:00
JC Brand
75b61fda6f Allow only a whitelist of settings attrs to be overridden 
Makes it more secure, since the enclosed converse object as access to
privileged data, we don't want people to inject code that could expose that.
 2013-08-24 02:43:41 +02:00
JC Brand
502b922515 Only show the controlbox after attaching. Updates #41. 2013-08-24 02:29:13 +02:00
JC Brand
f96c52a09a Bugfix. Set the connection attr on converse. Updates #41 2013-08-24 02:20:00 +02:00
JC Brand
5551ff0127 When prebinding, attach automatically. Fixes #41 
This requires that valid jid, rid, sid and bosh_service_url values be given (or
a valid connection object that was already attached).

Updated the docs to reflect these changes.
 2013-08-23 00:51:32 +02:00
JC Brand
4253c9aeae Restrict logging only to when debug=true. 2013-08-23 00:51:32 +02:00
JC Brand
c788041a0c Merge branch 'sane-mockup' into otr 
Conflicts:
	docs/html/searchindex.js
	index.html
 2013-08-20 22:38:24 +02:00
JC Brand
cf4cec1e29 Refactored sendMessage 
Let the message only be sent when an event has been triggered.
This allows us to first (if necessary) let OTR process the image.
 2013-08-16 16:05:24 +02:00
JC Brand
a2aeec8449 Add initial OTR code. 
- /otr will generate a new private key (or fetch it from storage).
 2013-08-16 15:48:23 +02:00
JC Brand
57fc8b9832 Merge branch 'master' into otr 
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
 2013-08-16 11:28:34 +02:00
JC Brand
72d0f566fc Merge branch 'master' into mockup 2013-08-15 20:47:50 +02:00
JC Brand
cf161a729a Add contacts regardless of how getVCard failed 2013-08-15 20:47:19 +02:00
JC Brand
c43c34013b Add font icon required changes for chatrooms. 2013-08-15 20:36:06 +02:00
JC Brand
f846e70c10 Merge branch 'master' into mockup 2013-08-15 20:34:04 +02:00
JC Brand
7e0f538029 Bugfix. removeRoom doesn't exist anymore 2013-08-15 20:33:42 +02:00
JC Brand
15ed513345 Start making the markup changes required for the font icons 2013-08-15 20:14:00 +02:00
JC Brand
359dbc68f7 Merge branch 'master' into mockup 2013-08-15 19:36:46 +02:00
JC Brand
44d094f56f Add a debug option (logs to browser console) 2013-08-15 19:34:40 +02:00
JC Brand
53359b7ddc Register presence and message handlers before getting the roster 
Otherwise some presence notifications might be lost
 2013-08-15 19:30:33 +02:00
JC Brand
ae0c561d88 Indentation 2013-08-15 18:32:07 +02:00
JC Brand
84f4e47127 More tweaks and fixes 2013-08-12 21:32:00 +02:00
JC Brand
f7c579e7e6 Add OTR to bower.json and converse.js 2013-08-09 19:22:49 +02:00
JC Brand
2d4a14ac2d Don't expose the Strophe connection object globally. 
Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
 2013-08-05 09:25:29 +02:00
JC Brand
457a11c54e Send messages from full JID. Fixes #13. 
Messages sent between two Gtalk accounts weren't being received.
 2013-08-04 18:31:45 +02:00
JC Brand
c5192f8ade Bugfix. Updates #32 
Users without roster contacts didn't have XMPPStatus.initStatus called and
therefore had a default status of offline.

Fixed this by setting the status to online from the start. The fetch command
will get the true status from localStorage (if available).

Made sure that the rest of converse's onConnected code is called in the
callback from fetch (so that we know the user's status is correct).

Updated and fixed tests.
 2013-08-04 15:39:46 +02:00
JC Brand
72ca5158f3 Attach panels to the DOM upon initialize. 
On Plone I've been having issues with event handlers being registered on
elements not yet added to the DOM not being called.

Also, get rid of the misnamed $parent attribute on the panels. Instead, pass in
the correct parent to initialize.
 2013-08-02 12:26:16 +02:00
JC Brand
99ae726209 Specifically include strophe, 
otherwise the optimizer doesn't include it
 2013-07-30 22:28:54 +02:00
JC Brand
9f2e5d291f Bugfix. Get value from val() method, not attr. 2013-07-30 00:16:17 +02:00
JC Brand
7ed30139d6 Move path and shim configs from converse.js to main.js 
This should make it easier to create custom builds, e.g. with more or less
dependencies.
 2013-07-29 22:34:33 +02:00
JC Brand
62c314ff66 Remove the Libraries dir and fix paths in converse.js 2013-07-29 22:22:12 +02:00
JC Brand
8f8ecbd78c Add missing semi-colon (jshint) 2013-07-27 10:53:22 +02:00
JC Brand
48e3c73d2c Merge pull request #29 from matheus-morfi/spinnertocss 
Removing spinner after login attempt
 2013-07-26 16:52:06 -07:00
Sergio Oliveira
95a2f23d15 Removing spinner after login attempt 2013-07-26 15:30:30 -03:00
JC Brand
fd526a1832 Fix for the previous fix :) 2013-07-24 23:10:56 +02:00
JC Brand
4c0d4f2ac5 bugfix. Fixes #26. Only the first minute digit was shown. 2013-07-24 22:58:53 +02:00
Matheus Figueiredo
19a1be391d using span with css instead of img 
using span instead of img to avoid problems with relative paths
 2013-07-23 13:42:45 -03:00
JC Brand
8293bd0da5 Bugfix in jquery element query 2013-06-02 22:32:33 +02:00
JC Brand
9b5c9138fb Add a config option to by default show the controlbox 2013-06-02 21:40:05 +02:00
JC Brand
4d9b9a7ba4 Move locales.js to locale dir 
Trying to make it simpler and easier for people to add new translations by
reducing the amount of places where edits need to be made (e.g. no new edits
required in converse.js now).
 2013-06-02 19:38:11 +02:00
JC Brand
befcadbd91 Add de.js with DE translations 2013-06-02 18:48:25 +02:00
JC Brand
9b9e514e4f Move everything into the initialize method 
This is so that the code only gets parsed once initialized is called.

We want the code to be parsed only then, because this allows us to
specifiy the translation language as a configuration setting to initialize.
 2013-06-02 00:21:06 +02:00
JC Brand
debb773ea5 Add jed.js for i18n support and wrap all strings 2013-06-01 13:18:33 +02:00
JC Brand
ba82f7bbce Auto-reconnect when the connection drops. 2013-05-31 21:53:49 +02:00
JC Brand
8c6a37b2ef Bugfix. Error presence stanzas don't have a from attr 2013-05-31 21:00:54 +02:00
JC Brand
9913cb6f98 Fallback to JID when no fullname in vcard. 
Also a bugfix: make sure to render the status widget when the user doesn't have
any roster contacts.
 2013-05-31 21:00:26 +02:00
JC Brand
91bdb56bdb Fixed race condition bug. More intelligent fetching of vcards 2013-05-31 16:55:58 +02:00
JC Brand
c845d11f26 Make sure chat-info msgs are not auto-removed 2013-05-31 09:58:12 +02:00
JC Brand
18fc903563 Use addHelpMessages method 2013-05-31 09:50:01 +02:00
JC Brand
0a0e4f2a3e Enable user to reconnect to an open disconnected room 
When a user has been removed from a room and the room is still open,
we want to re-use that same room once they join it again.
 2013-05-31 09:41:09 +02:00
JC Brand
49b99d9693 Refactored status message rendering code 
As a result we now implement more status codes from the spec.
Specifically the codes related to forced removal form the room

Also fixed a bug related to wrong authentication when logging in.
 2013-05-30 21:25:54 +02:00
JC Brand
7d1a7fd6b4 Add /me messages to chatboxes (they're already in chatrooms) 2013-05-30 18:06:40 +02:00
JC Brand
75adfc92f2 Bugfix. ejabbed doesn't seem to send a 110 status message 2013-05-28 20:51:01 +02:00
JC Brand
f84bf9259d Bugfix. Couldn't open chatroom when clicking from a list 2013-05-28 20:21:21 +02:00
JC Brand
e7debe0188 Fixed room join form styling. 
- list of rooms dropped off the controlbox
 2013-05-26 19:02:30 +02:00
JC Brand
4e2745a47d Add bosh_service_url to list of default config pars 2013-05-26 09:35:16 +02:00
JC Brand
7db90a5eb8 Make sure to display the stauts message when opening a chatbox 2013-05-23 11:33:21 +02:00
JC Brand
7f4f3d7def Add default config options to converse.js 2013-05-21 16:48:51 +02:00
JC Brand
a48a1f3d79 Add a config setting to hide the MUC server form input 2013-05-21 16:30:39 +02:00
JC Brand
d582e0f3bb Bugfix 2013-05-21 14:10:10 +02:00