pzia
9127b0745a
Merge https://github.com/jcbrand/converse.js into docubuntu
2015-04-26 11:12:06 +02:00
JC Brand
80943f9d24
Make sure that bundler also gets installed.
...
- Added a stamp file for bundler.
- We now specify binary paths for bundler and Sass.
- Added a step "watch" to watch the Sass files.
- Add map file for Sass/CSS
2015-04-26 09:44:29 +02:00
pzia
7e44694d66
Note for debian & ubuntu users
2015-04-26 07:56:22 +02:00
JC Brand
3df0c95714
Merge branch 'master' into roster_refactor
2015-04-25 23:37:12 +02:00
JC Brand
c2be6019f7
Remove type="email" from JID input.
2015-04-25 23:34:52 +02:00
JC Brand
aa3de742c0
Merge branch 'master' into roster_refactor
2015-04-25 23:06:59 +02:00
JC Brand
6d0efe0f82
Generate JSON from the new fr po file
2015-04-25 22:49:49 +02:00
JC Brand
a3da42aeed
Update changelog
2015-04-25 22:45:16 +02:00
thierrytiti
9da6c0e9ec
French translation
2015-04-25 22:43:19 +02:00
JC Brand
d6038c7c7b
Allow the URL to the sounds to be configurable.
...
Made some modifications to the code contributed by @thierrytiti and documented
the change.
Fixes #344
2015-04-25 22:41:29 +02:00
thierrytiti
310d2b77f3
typo
2015-04-25 22:26:10 +02:00
thierrytiti
7ec44d56d5
add sounds path
2015-04-25 22:25:59 +02:00
JC Brand
1ba42a0d4d
Document the change by @thierrytiti
2015-04-25 22:22:16 +02:00
thierrytiti
addd2c2ac3
Bug in parsing search result
2015-04-25 22:20:15 +02:00
JC Brand
87ff04d806
Some small documentation fixes.
2015-04-24 12:03:22 +02:00
JC Brand
96e8a285b7
Merge branch 'master' into roster_refactor
2015-04-21 17:36:13 +02:00
JC Brand
3c71031390
Update changelog for issue #372
2015-04-21 17:34:15 +02:00
JC Brand
6dc355a02a
Show the domain when rendering a legacy registration form.
...
Also updated the changelog with #377
2015-04-21 17:21:26 +02:00
JC Brand
848c13eb62
Merge branch 'master' into roster_refactor
...
Conflicts:
dev.html
2015-04-21 16:51:15 +02:00
JC Brand
f002ab04b7
Merge pull request #377 from gbonvehi/issue-370-reg-fails
...
Issue #370 registration fails
2015-04-21 16:43:47 +02:00
Guillermo Bonvehí
8934043d79
Submit registration form as xform or legacy
...
Support to send the registration form as legacy or xform, we
use the same variable form_type that was already being used when
calling render
Added submission tests
2015-04-21 11:05:03 -03:00
Guillermo Bonvehí
b08776a1ab
Added form_type setting tests
...
Two tests were created to see if RegisterPanel.form_type is set
to correctly to legacy or xform when receiving server registration
form.
2015-04-21 10:22:48 -03:00
JC Brand
d4cbb62155
Merge pull request #375 from floriancargoet/fix/collapsed-group-visibility-on-reload
...
Fix collapsed group visibility on reload
2015-04-17 17:20:17 +02:00
Florian Cargoët
50ef156a6d
Add changelog entry for #374
2015-04-17 17:06:17 +02:00
Florian Cargoët
8b695be4d7
Fix group visibility on page load.
...
Close #374
2015-04-17 17:06:16 +02:00
JC Brand
2ede031c27
Merge pull request #373 from floriancargoet/fix/group-show
...
Fixes #372
2015-04-17 16:35:31 +02:00
Florian Cargoët
63e3794ba7
Fixes #372
2015-04-17 16:24:02 +02:00
JC Brand
292d4a1bc9
Ignore messages sent to a different resource
2015-04-16 09:37:46 +02:00
JC Brand
ba85e0733f
Remove anon login settings
2015-04-16 09:37:46 +02:00
JC Brand
cd57e37f18
Merge pull request #371 from gbonvehi/rooms_doc_example_fix
...
Fix rooms grouping examples in docs
2015-04-16 08:26:08 +02:00
Guillermo Bonvehí
98191056e1
Fix rooms grouping examples in docs
2015-04-16 01:23:13 -03:00
JC Brand
f7a077a911
Merge branch 'master' into roster_refactor
...
Conflicts:
converse.js
2015-04-15 22:08:19 +02:00
JC Brand
36d9dbdea5
Use Strophe for managing namespaces.
2015-04-15 22:06:23 +02:00
JC Brand
34e2cfc191
Merge branch 'master' into roster_refactor
2015-04-15 21:52:14 +02:00
JC Brand
50f4d6b582
Use unminified strophe
2015-04-15 21:52:00 +02:00
JC Brand
1b6e67ae73
Don't call updateVCard if use_vcards is false.
2015-04-15 21:20:19 +02:00
JC Brand
324e3fee2a
Merge pull request #369 from theoziran/master
...
Fixing when the path has space, it closes #368
2015-04-15 09:07:56 +02:00
Theoziran Lima
8edb454966
Fixing when the path has space, it closes #368
2015-04-14 17:23:32 -03:00
JC Brand
937e1d3d4f
Remove all fuzzy entries in en po
2015-04-13 17:04:30 +02:00
JC Brand
3451fcf01e
Only set contact status offline if there aren't any other resources available.
2015-04-13 17:02:14 +02:00
JC Brand
f399c5f681
Add more protocol tests.
...
* Unsubscribing
* Incoming subscription requests.
Noticed that it's not necessary to call "unauthorize" when setting
subscription="remove".
2015-04-10 16:30:04 +02:00
JC Brand
e6f5b95da7
Fix tests by allowing removeFromRoster to be spyable.
2015-04-10 13:04:00 +02:00
JC Brand
1ce328783c
Also add tests for case where contact declines request.
...
Did a bit of renaming and fixed a bug in updateContact where a user wasn't
created when it should have been.
2015-04-10 13:01:31 +02:00
JC Brand
838ad13605
Merge branch 'master' into roster_refactor
...
Conflicts:
converse.js
2015-04-10 01:30:02 +02:00
JC Brand
827efab093
Fix and expand broken tests after recent refactor
2015-04-10 01:23:33 +02:00
JC Brand
c195d9055d
Use http URL for crypto.js to fix Travis fail
2015-04-10 01:12:33 +02:00
JC Brand
fde0e9c199
Fix RsT errors in docs.
2015-04-09 14:16:29 +02:00
JC Brand
3f884f0d03
Update the changelog after merge from 'anon_login' branch.
2015-04-09 14:13:21 +02:00
JC Brand
6ef2e50387
Merge branch 'anon_login'
2015-04-09 14:09:26 +02:00
JC Brand
960cf4a572
Looks like an older tag for crypto.js is not available anymore.
...
Fix this by pointing to the tag via a git URL
2015-04-09 10:36:38 +02:00
