Commit Graph

294 Commits

Author SHA1 Message Date
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