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

396 Commits

Author SHA1 Message Date
JC Brand
81f4d19a64 Add option to set the XHR user search URL. Fixes #51 2013-10-20 18:36:07 +02:00
JC Brand
25dc4a27e2 Add smiley support for chatrooms as well 2013-10-20 18:13:34 +02:00
JC Brand
4ab3498285 Bugfix. Roster didn't appear in some cases. 
Make sure the last roster item is still added (even if it's a zombie), so that
the roster will be shown (roster is only shown when last_item property is
true).
 2013-10-20 12:16:14 +02:00
JC Brand
a5daeb017e Emoticons now supported for single-user chat. 2013-10-19 23:18:17 +02:00
JC Brand
546204bed6 Merge branch '0.6.x' 2013-10-19 18:28:31 +02:00
JC Brand
fd349b217f Don't unnecessarily create objects for roster items 2013-10-19 18:24:06 +02:00
JC Brand
3d84b3e7ae IE8 bugfix. Fixes #52 2013-10-19 17:10:56 +02:00
JC Brand
3c57892cbf Add smiley menu to the chat toolbar 
Still to do is rendering smileys in the chat area and chatrooms.
 2013-10-17 20:30:37 +02:00
JC Brand
b061f403b3 Remove superfluous element #collective-xmpp-chat-data 2013-10-16 22:29:13 +02:00
JC Brand
6e15986a87 Merge branch '0.6.x' 
Conflicts:
	index.html
 2013-10-15 19:16:11 +02:00
JC Brand
150846849d Bugfix. Don't reconnect while strophe is still disconnecting 
Causes infinit loop of connects and disconnects
 2013-10-15 19:03:10 +02:00
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