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

1553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
6d026f010e Fix tests that were broken after vCard changes 
Conflicts:
	tests_main.js
 2013-10-03 13:51:29 +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
e62ee8836a Tests now work under phantomjs again 2013-10-03 12:43:59 +02:00
JC Brand
041ff88c6d Fix tests that were broken after vCard changes 2013-10-03 10:55:16 +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
e85eb66771 Merge branch '0.6.x' 
Conflicts:
	index.html
 2013-10-03 09:11:48 +02:00
JC Brand
32593b755f Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master 
Conflicts:
	locale/locales.js

Conflicts:
	index.html

Add Russian translation by bkocherov (actually made against master branch)
 2013-10-03 09:10:24 +02:00
JC Brand
b13ae5af69 Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master 
Conflicts:
	locale/locales.js
 2013-10-03 08:58:25 +02:00
JC Brand
22395999ca Merge branch '0.6.x' 
Conflicts:
	converse.css

I didn't merge converse.css or converse.min.css, instead fell back to master versions.
 2013-10-03 08:41:14 +02:00
JC Brand
3417e8fc08 Update CHANGES.rst 2013-10-03 08:36:57 +02:00
JC Brand
e9102a9621 Merge branch '0.6.x' of git://github.com/w3host/converse.js into w3host-0.6.x 2013-10-03 08:16:26 +02:00
Boris Kocherov
51d0f7d8a3 Merge branch 'master' of https://github.com/jcbrand/converse.js 2013-09-29 17:32:40 +04:00
Boris Kocherov
155b8e6a40 Russian translation: continue translation. 2013-09-29 17:30:38 +04:00
JC Brand
e4a1ccf1c0 Remove old classes before adding new ones. Updates #38 2013-09-26 21:48:45 +02:00