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
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
w3host
d0e9618efa
Hungarian translation
2013-09-26 15:19:14 +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
Boris Kocherov
f21dffbc27
Add Russian translation.
2013-09-25 14:49:17 +04:00
JC Brand
aad8de02d0
Merge pull request #54 from TracyWebTech/css-clash
...
Avoiding clash with bootstrap
2013-09-20 00:03:33 -07:00
Sergio Oliveira
0bf807fd94
Avoiding clash with bootstrap
...
Using #chatpanel in front of every css class to avoid css name clashing
with bootstrap and other css frameworks
2013-09-19 13:05:29 -03:00
JC Brand
1d14a2b950
Use const for enter key
2013-09-18 09:25:40 +02:00
JC Brand
f80fd2a64c
Mention case where grunt is not installed globally
2013-09-17 12:10:59 +02:00
JC Brand
46fe0ac511
Mention case where grunt is not installed globally
2013-09-17 12:07:42 +02:00
JC Brand
3785737820
Mention OTR support
2013-09-17 09:43:59 +02:00
JC Brand
054093682d
Browser tests work but phantomJS tests fail
...
will have to debug later
2013-09-15 23:18:54 +02:00
JC Brand
d1cc7b2cf0
Mention OTR support
2013-09-15 22:28:01 +02:00
JC Brand
40c9c397de
Updated js translation files (after OTR merge)
2013-09-15 22:20:32 +02:00
JC Brand
5598dd0379
Add make command po2json and run it
2013-09-15 22:16:33 +02:00
JC Brand
6517b9bb9d
Merge branch 'otr'
...
Conflicts:
CHANGES.rst
locale/af/LC_MESSAGES/af.js
locale/af/LC_MESSAGES/converse.json
locale/af/LC_MESSAGES/converse.po
locale/converse.pot
locale/de/LC_MESSAGES/converse.po
locale/en/LC_MESSAGES/converse.po
locale/es/LC_MESSAGES/converse.po
locale/fr/LC_MESSAGES/converse.po
locale/it/LC_MESSAGES/converse.po
locale/pt_BR/LC_MESSAGES/converse.po
2013-09-15 22:08:34 +02:00
JC Brand
04c71d5bae
Merge branch '0.6.x'
...
Conflicts:
CHANGES.rst
2013-09-15 21:45:41 +02:00
JC Brand
2c884c05a3
Use * for rst bullet rendering
2013-09-15 21:44:55 +02:00
JC Brand
02978eca5a
Regenerated docs (new version number). Add release checklist
2013-09-15 21:39:58 +02:00
JC Brand
7432cd2406
Regenerated docs (new version number). Add release checklist
2013-09-15 21:37:56 +02:00
JC Brand
9c75683354
Bump versions and re-minified
2013-09-15 21:35:03 +02:00
