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

1070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
b061f403b3 Remove superfluous element #collective-xmpp-chat-data 2013-10-16 22:29:13 +02:00
JC Brand
bb1f9955c9 Add smileys and minimize buttons to the mockup 2013-10-16 22:27:53 +02:00
JC Brand
a466ebe38d Merge branch '0.6.x' 2013-10-16 12:04:03 +02:00
JC Brand
3260c7d2b0 Use @thomascube's roundcube add-on fork. 2013-10-16 12:03:24 +02:00
JC Brand
66d4a16799 Also add address to index.html 2013-10-16 11:53:45 +02:00
JC Brand
1fa47c6633 Merge branch '0.6.x' 
Conflicts:
	converse.min.js
	docs/html/searchindex.js
 2013-10-16 11:50:55 +02:00
JC Brand
7a3f0e92f4 Add bitcoin address for donations 2013-10-16 11:49:05 +02:00
JC Brand
29fc658c05 New release, 0.6.6 2013-10-16 11:26:22 +02:00
JC Brand
8713e2cc7a Merge branch '0.6.x' 2013-10-15 21:05:28 +02:00
JC Brand
0deb8be9e7 Fix tests. sendPresence is now sent out at a different place 2013-10-15 21:05:07 +02:00
JC Brand
6e15986a87 Merge branch '0.6.x' 
Conflicts:
	index.html
 2013-10-15 19:16:11 +02:00
JC Brand
f1a1d36cc4 Add Dutch translation, provided by @maartenkling 2013-10-15 19:15:06 +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
90be11aee8 New release: 0.6.5. 
Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
 2013-10-08 09:11:04 +02:00
JC Brand
a01d510249 Proper truncating (with ellipsis) of chatroom names 2013-10-08 09:09:17 +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
c214000eec Merge branch '0.6.x' 
Conflicts:
	converse.min.js
 2013-10-07 09:22:17 +02:00
JC Brand
86eef5b1c2 Re-minify JS 2013-10-07 09:21:15 +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
86521d0076 Merge branch '0.6.x' 
Conflicts:
	Gruntfile.js
	converse.min.js
 2013-10-05 23:21:08 +02:00
JC Brand
1b1bac22ef Reminify JS 2013-10-05 23:18:57 +02:00
JC Brand
95dd2dac4b Don't use the requirejs task, it doesn't support almond. 
Instead we build manually. Fixed paths in build.js

Conflicts:
	Gruntfile.js
 2013-10-05 23:17:45 +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
fe7c297acc Update docs and regenerate 2013-10-05 08:48:25 +02:00
JC Brand
46b36f9e3a Minified CSS and JS 2013-10-05 08:47:57 +02:00
JC Brand
3670ba57e8 Don't use the requirejs task, it doesn't support almond. 
Instead we build manually. Fixed paths in build.js
 2013-10-05 08:47:49 +02:00
JC Brand
ff8c509a60 Minify CSS and JS 2013-10-05 08:04:32 +02:00
JC Brand
e4a6223b86 Merge pull request #68 from coderhs/minify_dependent_files 
Updated information of files, required during minify
 2013-10-04 08:39:24 -07:00
coderhs
8a795d87ba Updated information of files, required during minify 2013-10-04 18:35:59 +05:30
JC Brand
47bac92f2f Merge branch '0.6.x' 
Conflicts:
	README.rst
	converse.js
 2013-10-04 09:04:39 +02:00
JC Brand
feb87bc88b Mention new languages 2013-10-04 09:03:50 +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
b6324a24ff Generate docs 2013-10-03 16:31:18 +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