Commit Graph

2661 Commits

Author SHA1 Message Date
JC Brand
c0c4cd9272 Rename builds directory to dist
To conform with how many other projects name their directories.
2016-02-28 09:00:22 +00:00
JC Brand
9f9b38f852 Some i18n fixes
The __ translate method should only be run *after* converse.js has been
initialized and we know what the actual desired language is

Also fix bug in src/locales.js where wrong langs were assigned to wrong keys.
2016-02-28 08:45:36 +00:00
JC Brand
c370b3e989 Remove the config file for the no-OTR build.
Custom builds like this should rather be done by removing components in
converse.js and then running `make build`
2016-02-28 08:29:23 +00:00
JC Brand
7eb453efa1 Somewhere along the way the code to build the locales got removed
Adding it back again.
2016-02-28 08:26:56 +00:00
JC Brand
d00f2d1c3d Figured out how to exclude the locales from the no deps build 2016-02-28 00:53:44 +00:00
JC Brand
450c6c7d38 templates are in the bundle, no need to load them again. 2016-02-28 00:38:47 +00:00
JC Brand
6524614491 Not going to use uglify.js.
It doesn't properly preserve copyright headers from r.js builds.
2016-02-28 00:37:57 +00:00
JC Brand
fb2e5e27c7 Let the utils work without Jed available. 2016-02-28 00:37:38 +00:00
JC Brand
9d104f17e6 Remove unused dependency in src/locales.js 2016-02-28 00:36:51 +00:00
JC Brand
21a501ca68 Rename src/templates.js to src/converse-templates.js 2016-02-28 00:33:50 +00:00
JC Brand
7e8a11df88 Some cleanup refactoring of how stuff is built.
Strophe.ping.js was still in the no-dependencies build

Also clean up wrapper-end.js a bit as well as the grouping of dependencies in
non_amd.html

Remove locales from utils.js and include it in converse.js so that the locales
can more easily be removed from the build.
2016-02-28 00:33:24 +00:00
JC Brand
77a563955e Move build instructions from Gruntfile to Makefile
Also, remove build-no-locales-no-otr.js
2016-02-27 15:57:30 +00:00
JC Brand
16cdd4444e Fix JSHint issues. 2016-02-26 18:23:30 +00:00
JC Brand
a392f3b769 Fix build of converse.js (build with all deps) 2016-02-26 17:35:01 +00:00
JC Brand
ba05d4e779 Add a build step to create a build of only the converse.js modules
This is now used in non_amd.html and means that the individual converse.js
modules don't need to support the non-AMD case.
2016-02-26 17:28:18 +00:00
JC Brand
d349bdc17c Add "make doc" alias to "make html" 2016-02-26 16:33:16 +00:00
JC Brand
e68c51d2fa Explicitly list dependencies for modules
Instead of using the deps-*.js files. Builds will currently break, they still
need to be reworked.

Also moved the refreshWebkit method to utils.
2016-02-23 07:15:37 +00:00
JC Brand
e79c204241 Refactor the API out into a separate module, src/convers-api.js
Plugins are now also updated so that they can get the closured converse object
directly and don't need to rely on _super.
2016-02-20 15:06:12 +00:00
JC Brand
8bf8c318aa Merge pull request #600 from davec82/master
change xmpp status also on icon-status click
2016-02-20 10:22:41 +01:00
JC Brand
0db447a585 Add some tests for the ping feature. 2016-02-19 13:02:42 +00:00
JC Brand
f371b62157 Move XMPP Ping code to a plugin. 2016-02-19 13:02:31 +00:00
Davide Colombo
cde205f673 fix change xmpp status also on icon-status click 2016-02-19 12:49:02 +01:00
JC Brand
16f8b14ea8 Trying out the new pull request template 2016-02-19 10:50:40 +00:00
JC Brand
cb241dd594 Moved all the registration code into a plugin 2016-02-19 10:43:46 +00:00
JC Brand
147a3c9e3e Found more MUC stuff in core.
Move the Occupants views and models to converse-muc.js as well as some
MUC-specific config variables.
2016-02-19 09:45:24 +00:00
JC Brand
572d896676 Merge pull request #598 from davec82/master
Add synchronize_presence option
2016-02-18 12:28:54 +01:00
Davide Colombo
e934917685 add synchronize_availability option 2016-02-18 12:18:56 +01:00
JC Brand
8c06f917ae Restore @rlanvin's changes that were lost during merge
Fixes #596
2016-02-17 17:09:48 +00:00
JC Brand
f1b999d01a update the plugin docs
Add a UMD header so that the example plugin can be used without require.js
Remove needles cruft and dependencies.
2016-02-17 17:01:55 +00:00
JC Brand
767da07f49 Add converse-otr to non_amd.html 2016-02-17 16:52:02 +00:00
JC Brand
2765715f32 Merge pull request #595 from rlanvin/fix-non-amd
Fix non_amd.html
2016-02-17 15:14:00 +01:00
rlanvin
00caccd1a3 Fix non_amd.html
- converse-muc.js was overriding the global "converse" variable
  with undefind (the factory function didn't return anything)
- locales was not defined in utils.js in non AMD (not passed in
  the factory function)
2016-02-17 10:04:46 +02:00
JC Brand
d66ea2079f Merge pull request #592 from davec82/master
add random resource also for auto_login
2016-02-16 15:52:22 +01:00
Davide Colombo
2e50ecb9c1 add method to generate random resource and add random resource also for auto_login 2016-02-16 15:29:13 +01:00
JC Brand
a687e87e01 Remove deprecated API and update changelog. 2016-02-16 07:50:52 +00:00
JC Brand
da0c858fe0 Used debounce ineffectually. Fixed now.
The ChatBox.show() method was being called for every invocation, 100ms after
the fact, instead of it being called only once.

Fixed that and also changed to call it at the start.
2016-02-16 07:47:16 +00:00
JC Brand
e94904e4a1 Don't play sound notifications for...
OTR messages which are setting up an encrypted session.
2016-02-16 07:47:16 +00:00
JC Brand
e27dfa060a Add a new template for OTR-related toolbar buttons
The OTR functionality is now fully decoupled and can be removed entirely
without breakage.
2016-02-16 07:47:16 +00:00
JC Brand
9eba9989dc OTR stuff has been moved to a component/plugin in src/converse-otr.js
Also fixed errors with converse obj not being defined in the MUC plugin.
2016-02-16 07:47:16 +00:00
JC Brand
576efc4815 Initial work on breaking converse.js up into components
First component to remove is MUC which was moved to src/converse-muc.js
The components are written as plugins and use converse.js's plugin machinery.

Update the plugin docs somewhat with new insites found while working on the muc
plugin.
2016-02-16 07:47:08 +00:00
JC Brand
02e74ed377 Merge pull request #587 from davec82/master
logout if you are using auto_login=true
2016-02-16 08:41:32 +01:00
JC Brand
894bc41a0f Merge pull request #590 from rlanvin/no-focus-stealing
Don't steal focus when chatbox is opened automatically
2016-02-15 21:13:50 +01:00
rlanvin
6599b70602 Don't steal focus when the chatbox opens automatically
- Adding a new parameter "focus" to ChatBoxView.show
- Removing the parameter "callback" not used
2016-02-15 18:19:14 +02:00
JC Brand
76ed0b7b85 Disable cache when using make serve 2016-02-15 15:07:12 +00:00
JC Brand
b99cfddec3 Merge pull request #589 from rlanvin/save-scroll
Keep scroll position on minimize/maximize
2016-02-15 13:41:57 +01:00
rlanvin
1d005a5612 Keep scroll position on minimize/maximize 2016-02-15 14:37:53 +02:00
JC Brand
94004eaa99 Render the default mockup from the templates
The default mockup is now a "live mockup" in the sense that it renders based
upon the templates in `src/templates`.

We use Jasmine and the test_utils to render the different elements.

updates #576
2016-02-15 08:52:23 +00:00
JC Brand
fae4f36886 Use the unminified build file, instead of the minified one.
This should keep diffs smaller and readable.
2016-02-13 18:53:56 +00:00
Davide Colombo
c29534801a disable auto_login on logout 2016-02-12 15:26:39 +01:00
Davide Colombo
69c6749e6a fix typo in italian translation 2016-02-12 14:28:40 +01:00