Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
8,490 Commits 2 Branches 109 Tags 304 MiB
5822fade32
Commit Graph

323 Commits

Author SHA1 Message Date
JC Brand
eca11953bb Upgrade to fontawesome 5 2018-09-04 13:34:06 +02:00
JC Brand
45fc71c05d More jsdoc docstrings as well as an intro page and JSON config 2018-09-02 10:11:37 +02:00
JC Brand
dc4c832fce Add jsdoc docstrings to chats API. 
Link to the jsdoc output from the Sphinx docs
 2018-08-01 12:11:10 +02:00
JC Brand
81ed773baa Updated css and fix some niggles in the Makefile 2018-06-14 10:22:16 +02:00
Maxime Buquet
2ff9a3c6fd Fix build targets in Makefile (#1112) 
The 'dist/converse-no-dependencies-es5.js' rule is called
'dist/converse-no-dependencies-es2015.js'.

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
 2018-06-11 22:50:06 +02:00
JC Brand
907775d784 No further need for a separate babel file and transpile step 2018-06-07 19:06:35 +02:00
JC Brand
659f70b28b Add the ability to make different kinds of builds 2018-06-04 13:38:53 +02:00
JC Brand
bc872ee2cb Fix various failing tests and update Makefile 2018-06-04 11:20:34 +02:00
JC Brand
6dc9e8edf1 Use webpack for module bundling 2018-05-25 14:23:32 +02:00
JC Brand
fa849b3dfa fixes #1091 
We no longer need inverse.css
 2018-05-24 14:38:17 +02:00
JC Brand
d0f490bbdc Start using Sass for the website CSS and rename 2018-05-15 09:38:20 +02:00
JC Brand
72001cb9df updates #1100 More jsdoc docstrings 2018-05-11 13:42:35 +02:00
JC Brand
38499917a9 updates #194 
Include entity capabilities hash in outgoing presences

Also, started some work on using jsdoc for rendering API documentation.
Ideally that would go into a separate commit but that would take ages to
untangle.
 2018-05-11 13:35:27 +02:00
JC Brand
df948a8dd6 Also allow a single-user chat to be embedded into the page 2018-05-03 17:01:17 +02:00
JC Brand
28ce3b5fa4 Fix paths for making css 2018-04-30 15:40:34 +02:00
JC Brand
aa6a739cfa Initial work on showing avatars in messages. 
- Update the mockups to show avatars.
 2018-04-30 15:37:36 +02:00
JC Brand
fe1ba6265a Revert "Doesn't seem necessary to build fonts.css" 
Actually, it's used for rendering a MUC inside a webcomponent!
 2018-04-24 16:27:56 +02:00
JC Brand
07ac8d4a3e Various HTML/CSS fixes for the demos, particularly embedded MUC 2018-04-24 14:46:09 +02:00
Emmanuel Gil Peyrot
2267c8459d Add rules to generate PNG logos 2018-03-30 14:59:32 +02:00
Emmanuel Gil Peyrot
8efcbeabb0 Fix make help’s unclosed strings 2018-03-30 14:59:32 +02:00
JC Brand
1cec976b5b Don't build theme.css from sass 
The theme is still bootstrap3 based and there isn't enough time
currently to redo on bootstrap4.
 2018-03-30 14:23:39 +02:00
JC Brand
a9d2740b8a Regenerated 2018-03-30 14:22:41 +02:00
JC Brand
516352c413 Disable emoji images by default 2018-03-30 14:16:06 +02:00
JC Brand
3f729aac1b Doesn't seem necessary to build fonts.css 2018-03-30 14:16:05 +02:00
JC Brand
ba1d49383f No rule to make mobile.min.css 2018-03-30 14:16:04 +02:00
JC Brand
877acd16d2 Update eslint 2018-03-17 18:54:19 +00:00
JC Brand
fa30f936b6 Use sass for the theme css 2018-03-11 12:04:27 +01:00
JC Brand
439e2a25ca Merge branch 'master' into bootstrap4 2018-03-06 11:40:10 +01:00
JC Brand
37a182d4c0 Clean up and condense Makefile 2018-03-06 11:26:47 +01:00
JC Brand
d4d3d4c838 Merge branch 'split-muc' into bootstrap4 2018-03-05 16:51:33 +01:00
JC Brand
8211ed8f70 Release 3.3.4 2018-03-05 14:43:53 +01:00
JC Brand
e143c88475 More work on the "add chatroom" modal. Working now. 2018-02-22 15:58:23 +01:00
JC Brand
617019af0e Merge remote-tracking branch 'origin' into bootstrap4 2018-02-15 14:15:04 +01:00
JC Brand
db85cb7f1d Release 3.3.3 2018-02-14 16:53:07 +01:00
JC Brand
08a76d8a6b Merge branch 'webcomponent-embedded' 2018-02-14 02:15:49 +01:00
JC Brand
2a2e4688a7 Update version number for CDN files in quickstart 2018-02-14 02:05:53 +01:00
JC Brand
03371c1815 Add css file with only fonts. 
Needed when converse.js is included inside a webcomponent.
The fonts.css file is then copied over to the host DOM.

Necessary due to this bug:
  https://bugs.chromium.org/p/chromium/issues/detail?id=336876
 2018-02-09 16:37:55 +01:00
JC Brand
e7aed050b4 Move test pages into the tests folder 2018-02-07 13:26:39 +01:00
JC Brand
1da5592607 We need NPM dependencies to generate CSS 2018-01-29 17:05:23 +01:00
JC Brand
6b644d6d11 Release 3.3.2 2018-01-29 16:48:54 +01:00
JC Brand
808155bc3c Place chat boxes inside bootstrap rows 
instead of the other way around.
 2018-01-26 14:41:50 +01:00
JC Brand
7f8b42faf0 Some work on bundling bootstrap within the css files. 
Will likely later have to create versions which exclude bootstrap
 2018-01-25 16:52:01 +01:00
JC Brand
ccf5ce2ae5 New release 3.3.1 2018-01-18 14:48:32 +01:00
JC Brand
8f455cf902 Release 3.3.0 2018-01-17 19:45:33 +01:00
JC Brand
fc17550d0c Trying to get tests to pass on travis 2018-01-15 20:13:12 +01:00
JC Brand
b47ecb7ccf Fix to work with Jed 1.1 2018-01-05 11:47:50 +00:00
JC Brand
71bdf08c25 Fix the no-dependencies demo 2018-01-04 17:02:29 +00:00
JC Brand
aa7483a881 Initial work on allowing a headless build 2017-12-22 21:24:15 +00:00
Justin Hornosty (jjrh)
075b1842a2 Option to use RVM for ruby 2017-12-20 11:02:46 +00:00
Justin Hornosty (jjrh)
a0ed8dee8d allow use of alternative port to for HTTPSERVE ( HTTPSERVE_PORT ) 2017-12-06 10:10:30 +01:00
JC Brand
c95a9d2728 Generate dist files with changes so far. 2017-12-04 12:29:46 +01:00
JC Brand
0acef8b49d Transpile backbone.vdomview 2017-11-17 11:02:55 +01:00
JC Brand
4d06228d89 Various changes around making builds. 
- Update build scripts to use transpiled versions of newly added modules
- Stop building locales.js and remove locales stuff from build scripts
- No need for Grunt anymore since we don't need to make locales.js
 2017-11-03 08:45:47 +01:00
JC Brand
007e608f32 More work on combining the inverse/converse builds 
- Use `enabled` method for plugins
- Rename `converse-inverse.js` to `converse-fullscreen.js` and make it a
  core plugin.
- We're no longer making separate mobile and inverse builds

No longer a need to whitelist/blacklist plugins for inverse to work.
 2017-11-02 16:41:06 +01:00
JC Brand
50064ec1fd Translation bugfix. Wait until after locales attribute is there 2017-09-27 00:33:58 +02:00
JC Brand
80b3692131 More work in removing locales from builds 2017-09-26 18:27:41 +02:00
JC Brand
3d53943f49 Generate pot file from the converse-no-dependencies build 
This is a workaround for the fact that getttext doesn't support ES2015 template
literals and it also allows us to scan for translateable strings in our HTML
templates.
 2017-09-24 00:30:43 +02:00
JC Brand
f120103c55 Remove never used sphinx options 2017-09-05 13:21:06 +02:00
JC Brand
34e214d0df New release 3.2.1 2017-08-29 13:28:34 +02:00
JC Brand
6ba923223a No apparent need to use python as gettext langauage fallback 2017-08-23 11:56:40 +02:00
JC Brand
f07f6e7bb7 Fix output files. 2017-08-09 18:43:05 +02:00
JC Brand
d6784201eb Bugfix. Uglify can't handle emojis 2017-08-09 18:24:20 +02:00
JC Brand
93e67567ce Make sure transpiling is done before building individual files 2017-08-09 17:33:41 +02:00
JC Brand
2603e6880e Fixes #899: Only touch stamp-npm if npm install was successful 2017-08-09 16:06:42 +02:00
JC Brand
4c853bff6f Fixes #902 2017-08-09 15:57:05 +02:00
JC Brand
8113a14ace Release candicate for 3.2.0 2017-07-22 22:23:44 +02:00
JC Brand
f0b61036d9 Also bump version in copyright header 2017-07-22 22:18:55 +02:00
JC Brand
b2a118ca9e Refactor slide methods in utils and use them for toolbar menus 2017-07-15 11:03:22 +02:00
JC Brand
3fabe88970 Updated package-lock. Fix tests. 2017-07-15 07:58:57 +02:00
JC Brand
914f739dbc Add slideUp and slideDown methods 
And use them in the roomslist plugin instead of the jQuery methods.
ALso removed the jQuery dependency in roomslist.
 2017-07-14 10:08:42 +02:00
JC Brand
019008c5af Merge branch '3.1.x' 2017-07-12 23:33:35 +02:00
JC Brand
7721275962 New release v3.1.1 2017-07-12 22:51:56 +02:00
JC Brand
ac1475ed43 Use uglify-es to minimize files.o 2017-07-10 16:25:27 +02:00
JC Brand
9333415640 Builds are now created from babel transpiled code 
Except for the esnext builds, which use the original code.

Fixes #866
 2017-07-10 16:25:21 +02:00
JC Brand
c422237668 New release: 3.1.0 2017-07-05 10:07:28 +00:00
JC Brand
3310df88c0 Regenerate build files. Some small fixes to inverse 2017-06-21 22:26:00 +02:00
JC Brand
02e5921415 Fix problem of stuck/hanging tests on TravisCI 2017-06-19 15:05:22 +02:00
JC Brand
b0c20d5473 We're now able to make inverse.js builds 2017-06-14 19:47:06 +02:00
JC Brand
7c831e1166 Various theming tweaks and improvements 2017-06-14 15:41:47 +02:00
JC Brand
615c00dba1 Create sass/converse dir to hold files for that theme 2017-06-13 21:17:00 +02:00
JC Brand
b66ff721cd Merge inVerse into this repo 2017-06-13 21:10:32 +02:00
JC Brand
e907bec4d8 Run tests using chromium headless. 2017-06-13 14:49:23 +02:00
JC Brand
e0ea0dfd88 Use --skip-rebase to not rebase URLs when using cleancss-cli 2017-04-26 09:34:02 +02:00
JC Brand
e338afadc2 New release 3.0.2 2017-04-23 17:25:19 +00:00
JC Brand
1936e28275 Enable creation of dist/converse-muc-embedded.js build file 2017-04-21 18:06:27 +02:00
JC Brand
3ea43c6a0f Use noConflict to avoid polluting globale namespace 
with lodash and Backbone.
 2017-04-21 18:06:27 +02:00
JC Brand
b41d978d00 Update sinon to 2.1.0 and eslint to 3.19.0 
Also update clean-css
 2017-04-06 23:09:22 +02:00
JC Brand
0c43e4b87c Upgrade to Jasmine 2.5.3 2017-04-06 11:31:05 +02:00
JC Brand
1fc4edd55f Update changelog after release. 2017-04-04 17:36:38 +00:00
JC Brand
21bc95a9f3 New release 3.0.1 2017-04-04 15:26:06 +00:00
JC Brand
06668d8733 3.0.0 release 2017-03-05 10:39:15 +00:00
JC Brand
cfb0cd0970 New defaults 2017-02-27 10:41:46 +00:00
JC Brand
38c9a9e10c Rework the way builds are created. 
Builds are now themselves UMD modules, so they could be `require`'d like any
other AMD module or they can still be used as old ES5 modules with globals.

Additionally the build is now closured, so that the almond API doesn't pollute
the global context with `define` or `require`. This does however mean that
`require` can no longer be used outside of the build (unless requirej.s is
included directly.
 2017-02-27 09:00:45 +00:00
JC Brand
1c4494967c Fix regex for double-digit numbers 2017-02-25 22:26:54 +00:00
JC Brand
6379b0dd7a Include the version number in the build files. 2017-02-17 20:52:08 +00:00
JC Brand
29ddf0b4db CSS: fix line heights 2017-02-16 14:42:50 +01:00
JC Brand
e7670a780a remove bower stuff from makefile 2017-02-16 13:02:09 +01:00
JC Brand
16688ebe1c Install fontawesome via NPM and remove last bower stuff 2017-02-16 12:03:56 +01:00
JC Brand
890d87c980 Add initial demo of embedded MUC chat 2017-02-02 21:55:05 +00:00
JC Brand
081f075aa9 Add eslint with lodash checking and apply its suggestions 2017-02-01 14:02:18 +01:00
JC Brand
9a09409ead Make sure bower and bundler are installed for dist/build 2016-11-07 15:53:51 +00:00
JC Brand
24a93c5638 Two changes. See below: 
- Updated to newest requirejs/text.
- Don't build dist files when running `make dev`
 2016-10-19 13:30:13 +00:00
JC Brand
f4fa753eda Add a mobile version of the website. 2016-10-19 10:51:21 +02:00
JC Brand
49d0834719 One less Grunt dependency (minifying css) 2016-09-23 13:57:53 +02:00
JC Brand
47214108d4 No need to build dist/templates.js anymore. 2016-09-23 13:14:54 +02:00
JC Brand
d005fe3f7a Mention KeyCDN 2016-05-23 19:31:56 +00:00
JC Brand
e1e37cbdce Regenerated location files (and fix Makefile to do this properly) 2016-04-04 10:34:39 +00:00
JC Brand
3787a34435 Create a mobile-specific build of converse.js 
This build doesn't include the converse-minimize and converse-dragresize
components.

Also regenerated the other builds.
 2016-04-01 13:37:53 +00:00
JC Brand
7f842c423f Update some bower dependencies and rebuilt dist files 
fixes #437
 2016-03-29 06:56:13 +00:00
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
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
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
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
76ed0b7b85 Disable cache when using make serve 2016-02-15 15:07:12 +00:00
JC Brand
a42ce378a1 Fall back to using python as xgettext language 
if javascript is not supported. Fixes #573
 2016-02-08 09:34:05 +00:00
JC Brand
cbdda26a19 New release: 0.10.1 2016-02-06 09:23:50 +00:00
JC Brand
6946c96a93 Make sure dev dependencies are there for generating CSS. 2015-11-09 17:04:24 +00:00
JC Brand
2253ec3d00 New release 0.10.0 2015-11-05 11:23:19 +00:00
JC Brand
e835a25184 Add jshint checking and fix errors. 2015-10-25 17:55:18 +00:00
JC Brand
7c5441053c Update help of Makefile and clean up a bit. 2015-10-24 20:46:57 +00:00
JC Brand
8b20394560 CSS improvements. 
- Last pending contact was being obscured/overflowing
- Select box for filtering was not aligned
 2015-10-16 14:12:10 +00:00
JC Brand
6369465661 Making a new 0.9.5 release. 2015-08-24 17:56:50 +02:00
JC Brand
2c21575719 Use bower to install bourbon and fix path issue. Fixes #417 2015-06-27 08:55:09 +02:00
JC Brand
785244f15e Add a styleguide to the documentation. 
Also update the contributor guidelines to mention the styleguide.
 2015-06-16 00:20:28 +02:00
JC Brand
36120cd7b2 Document clean command 2015-06-16 00:20:28 +02:00
JC Brand
d0a0c7f79a The dev-ruby target is replaced with stamp-bundler. 2015-06-01 22:32:25 +02:00
JC Brand
05e98f8ef9 fix typo. stamp-node must be stamp-npm 2015-04-26 11:57:42 +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
JC Brand
7637a3f12b Bundler bugfix in Makefile. 2015-03-06 18:00:35 +00:00
JC Brand
d20a8a65e4 Add a webserver for serving files during development. 2015-02-05 15:57:39 +01:00
JC Brand
ff7f312672 Merge branch 'master' of github.com:jcbrand/converse.js 
Conflicts:
	Makefile
 2015-02-05 11:32:14 +01:00
Guillermo Bonvehi
6d29f03ae1 Added new Makefile.win, it only has dev/build/check targets 
Gruntfile now appends .cmd extension to r.js if platform is win32
Made touch-npm/bower grunt task/targets
make -f Makefile.win to build on Windows
 2015-01-22 11:46:28 -03:00
JC Brand
6aa38952ab Make grunt path a variable and make other vars overridable 2015-01-18 19:10:22 +01:00
JC Brand
f4eb8b30b0 Add steps for installing Sass and Bourbon to Makefile 2015-01-01 03:45:26 +01:00
JC Brand
96d904f38e Merge branch 'master' into skeleton 2014-12-31 11:34:34 +01:00
JC Brand
15e3c3238a Update locale files when making a release. 2014-12-20 11:19:03 +01:00
JC Brand
063e31e39e Add skeleton-sass and convert css files to scss. 2014-12-13 00:14:11 +01:00
JC Brand
9359c76c42 Small tweaks to site and doc css. 
Also, in Makefile, remove old HTML build first during "make html" step.
 2014-12-07 10:48:32 +01:00
JC Brand
20e15b5623 Sphinx changes. 
* Add buildout config for Sphinx
* Add new Sphinx theme
* Remove the built html theme files
 2014-12-06 18:58:58 +01:00
Guillermo Bonvehí
e28d9a4801 Added po2json module path to Makefile, make po2json now updates the files correctly 2014-12-02 15:32:14 -03:00
JC Brand
7cf8dc6bee Fixed Non-AMD example. fixes #220 2014-09-22 16:10:20 +02:00
JC Brand
c44649a820 Generate new pot and po files 2014-08-25 14:39:32 +02:00
JC Brand
eb7749e6ca Rebuild. 2014-08-20 21:03:05 +02:00
JC Brand
882bbcb02e Add support for sound notifications. updates #62 
(on incoming messages)
 2014-08-20 21:00:28 +02:00
JC Brand
75022562f6 Use 'make build' 2014-08-04 23:09:14 +02:00
JC Brand
28e65c946c Add build step 2014-08-04 22:37:35 +02:00
JC Brand
21fd082c9b Bugfix. Only position groups once all of them have been fetched. 
updates #83
 2014-08-04 21:57:53 +02:00
JC Brand
c9e3a29515 Don't remove docs when calling Make 2014-07-23 13:12:18 +02:00
JC Brand
4f5534ed66 Finally fixed the non-AMD case to work with external templates. 2014-07-06 17:32:06 +02:00
JC Brand
c5ae10d962 Make an extra build specifically for including the website deps 2014-07-06 16:10:27 +02:00
JC Brand
7e95d3d01d Work on getting a working build for 0.8 2014-06-29 20:49:22 +02:00
JC Brand
5acd6baad7 Start managing converse.css via less 2014-05-07 22:36:45 +02:00
JC Brand
2a83d557d1 Order Makefile a bit more and bump release number 2014-04-18 17:47:47 +02:00
JC Brand
53a8f288bc Better phantomjs test runnning and reporting 
* Use phantom-jasmine instead of jasmine-reporters
* Update Makefile to use the test runner from phantom-jasmine
* Use newest phantomjs
* Use latest bower
* Turn of jquery effects when testing
 2014-04-18 17:41:59 +02:00
JC Brand
17a05ce801 Use fork of strophe.js which includes already built file. 
Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.
 2014-03-17 22:41:21 +02:00
JC Brand
b552b885f0 Add MakeFile target for setting up dev env. 2014-03-14 21:01:39 +02:00
JC Brand
8cd05206cb Bump release to 0.7.1 2013-11-17 17:15:07 +02:00
JC Brand
512a463750 Create 3 different builds. 
* converse.min.js
* converse-no-otr.min.js (Without OTR encryption)
* converse-no-locales-no-otr.min.js (Without OTR encryption or any translations)
 2013-11-17 16:55:38 +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
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
5598dd0379 Add make command po2json and run it 2013-09-15 22:16:33 +02:00
JC Brand
9c75683354 Bump versions and re-minified 2013-09-15 21:35:03 +02:00
JC Brand
bc31781309 Update Makefile to auto-bump version number 2013-09-15 21:35:02 +02:00
JC Brand
6768924884 Bump versions and re-minified 2013-09-15 21:29:02 +02:00
JC Brand
7922f17a79 Update Makefile to auto-bump version number 2013-09-15 21:09:42 +02:00
JC Brand
0ef6a727eb Add new Makefile step "merge" and document it. 2013-09-12 11:14:45 +02:00
JC Brand
9628189382 Can't call i18n.translate directly if we bundle without i18n support 2013-08-26 16:21:32 +02:00
JC Brand
b7ba673ca2 Update Makefile. Add option for generating POT file 2013-06-01 13:17:52 +02:00
JC Brand
c5604515cc Add build.js and update Makefile 
So that we can make releases
 2013-05-09 23:16:23 +02:00
JC Brand
2442e1ea71 Add initial documentation 2013-04-26 21:01:39 +02:00