Commit graph

manuel/uhr

Fork 0

6f7a77e355 ... and more linting Manuel Friedli 2016-06-26 23:29:50 +02:00
0035264f27 get rid of more linting errors Manuel Friedli 2016-06-26 23:26:45 +02:00
0b26225c87 get rid of linting errors, hopefully Manuel Friedli 2016-06-26 23:22:05 +02:00
63cbc1da3c define cleanup jobs Manuel Friedli 2016-06-26 23:02:18 +02:00
a64b1d02e7 clean up after we're done Manuel Friedli 2016-06-26 22:53:54 +02:00
b919bc2243 perhaps a new variable fixes it Manuel Friedli 2016-06-26 22:51:03 +02:00
574d3ad271 tried to fix setting of PATH Manuel Friedli 2016-06-26 22:44:26 +02:00
306b54c3e9 try and use locally installed node packages of bower and grunt Manuel Friedli 2016-06-26 22:42:49 +02:00
dc93de27e5 fixed YAML, again Manuel Friedli 2016-06-26 22:28:07 +02:00
3e2a37f3e7 fixed YAML Manuel Friedli 2016-06-26 22:22:09 +02:00
2394301b10 first attempt at creating environments and some sophisticated CI stuff. Manuel Friedli 2016-06-26 22:20:30 +02:00
b57ee1534a Merge branch '29-typo-in-readme-md' into 'develop' Manuel Friedli 2016-05-28 21:33:50 +02:00
6075d74022 fixed typo Manuel Friedli 2016-05-28 21:24:30 +02:00
a3cbfe8de5 Merge branch 'feature/update-markdown' into 'develop' Manuel Friedli 2016-05-27 17:52:38 +02:00
4ff55d967e updated README.md to use syntax highlighting in the markdown Manuel Friedli 2016-05-17 22:16:39 +02:00
a261d807cc Merge branch 'bugfix/build-failure' into 'develop' Manuel Friedli 2015-10-07 19:50:35 +02:00
2daf130c68 updated all dependencies to the latest available versions and re-generated some files in dist/ Manuel Friedli 2015-10-07 19:43:41 +02:00
04afcad428 okay, so deleting these dirs is not required Manuel Friedli 2015-10-07 19:16:03 +02:00
3b2fcbe16e tried to fix .gitlab-ci.yml Manuel Friedli 2015-10-07 19:14:09 +02:00
fcf16cc80e renamed COPYING to LICENSE Manuel Friedli 2015-10-07 19:00:37 +02:00
2bc132b76b incremented version to next dev: 8.0.2-dev.0 Manuel Friedli 2015-07-15 20:02:05 +02:00
f07ccb9918 updated version to next release, 8.0.1 v8.0.1 Manuel Friedli 2015-07-15 17:51:13 +02:00
5db6f042cf Merge branch 'feature/language-pt' into 'develop' Manuel Friedli 2015-07-15 17:47:54 +02:00
b98913ccf8 added dist-files Manuel Friedli 2015-07-15 17:43:35 +02:00
5944c3d487 added "fast forward" test page and added license header to the existing test file Manuel Friedli 2015-07-15 17:36:17 +02:00
250a5beb73 Merge branch 'develop' into feature/language-pt Manuel Friedli 2015-07-14 00:53:31 +02:00
672c453b90 added dist-files for portuguese Manuel Friedli 2015-07-14 00:39:34 +02:00
7c227ef572 corrected language string Manuel Friedli 2015-07-14 00:39:08 +02:00
2ab2e36349 added dist-files for portuguese language Manuel Friedli 2015-07-14 00:38:07 +02:00
2f57cb4054 Merge branch 'feature/gitlab-ci-yml' into 'develop' Manuel Friedli 2015-07-14 00:09:47 +02:00
9ead720de6 added .gitlab-ci.yml build descriptor Manuel Friedli 2015-07-14 00:06:29 +02:00
e19e11e4d6 added portuguese translation Manuel Friedli 2015-07-13 23:53:44 +02:00
6e7e5afc55 Merge branch 'bugfix/issue-28-fix-readme' into 'develop' Manuel Friedli 2015-06-17 00:11:19 +02:00
11495c1cca fixed paragraph 6 in the README.md. this fixes #28 Manuel Friedli 2015-06-17 00:05:30 +02:00
72c3cd0c06 use cordova, not phonegap playground/phonegap Manuel Friedli 2015-03-05 17:26:23 +01:00
445ddeab85 added generated phonegap files. this is for testing purposes only. Manuel Friedli 2015-03-05 14:48:50 +01:00
c8a359cfa3 Merge branch 'develop' into feature/splashscreen feature/splashscreen Manuel Friedli 2015-01-19 16:24:41 +01:00
221874df05 Merge branch 'develop' into feature/new-splashscreen feature/new-splashscreen Manuel Friedli 2015-01-19 11:28:07 +01:00
e104df7aa9 increment version number to next dev cycle Manuel Friedli 2015-01-19 01:57:40 +01:00
76a97046c8 incremented version to 8.0.0 v8.0.0 Manuel Friedli 2015-01-19 01:54:29 +01:00
2344a400d8 Merge branch 'feature/update-toolchain' into 'develop' Manuel Friedli 2015-01-19 01:50:46 +01:00
ef6d48b906 Merge branch 'feature/unify-versioninfo' into 'feature/update-toolchain' Manuel Friedli 2015-01-19 01:19:54 +01:00
80857bd69a Merge branch 'feature/update-toolchain' into feature/unify-versioninfo Manuel Friedli 2015-01-19 01:14:29 +01:00
2bc3298628 fixed typo Manuel Friedli 2015-01-19 01:11:41 +01:00
055cb6aca6 fixed path to the main uhr.css in the README.md Manuel Friedli 2015-01-19 01:09:38 +01:00
b8fbffdf3e also invoke the version task on grunt buildonly. Manuel Friedli 2015-01-19 01:07:09 +01:00
91ac2ce048 added grunt-version. what's now left to do is automatic/semi-automatic incrementation of version numbers. i'm not so sure anymore whether the files in dist/ should contain the version number in their filename. i'll ponder on that and decide later. Manuel Friedli 2015-01-19 01:01:06 +01:00
6692d2d6d9 Merge branch 'feature/update-toolchain' into feature/unify-versioninfo Manuel Friedli 2015-01-19 00:51:15 +01:00
316e045770 also minify the CSS files and store them in dist/ Manuel Friedli 2015-01-19 00:42:16 +01:00
959e4a41aa Merge branch 'feature/update-toolchain' into feature/unify-versioninfo Manuel Friedli 2015-01-18 22:39:58 +01:00
607eeabfd2 use separate .jshintrc for the tests. this allows us to remove the "predef" section from the productive .jshintrc, which is good. Manuel Friedli 2015-01-18 21:49:19 +01:00
bb69485b9f jshint didn't like the "e" variable, because of some possible problem in IE8; so I renamed it to "elem". Manuel Friedli 2015-01-18 21:40:36 +01:00
1e314cba57 added more tests: - test config options (default and custom) - test invalid parameters (language and theme) - test URL params (long and short) Manuel Friedli 2015-01-18 21:36:55 +01:00
2295283ba4 Merge branch 'feature/update-toolchain' into feature/unify-versioninfo Manuel Friedli 2015-01-18 18:54:18 +01:00
a8f8aa0947 first tests with firefox and chrome seem to indicate that it is working. i will have to deploy it onto my test server and perform some more tests. Manuel Friedli 2015-01-18 18:31:23 +01:00
5e85458936 added a manifest.appcache file; first draft. Manuel Friedli 2015-01-18 17:31:01 +01:00
e035362905 inserted some commented code in order to remind myself what to do about versioning. it's very tedious to maintain the version in 3 different places, so this needs to be handled by the build process, and one and only one source must be provided for the final version string; that is probably going to be package.json. Manuel Friedli 2015-01-18 17:24:17 +01:00
dfac2ae47a executed grunt in order to update the version info in the dist/* files Manuel Friedli 2015-01-18 17:17:17 +01:00
8c08c93b1d added description for the cookiePath config option, which has been completely undocumented so far. my bad. Manuel Friedli 2015-01-18 17:11:32 +01:00
3c193c5472 Merge branch 'feature/update-toolchain' into feature/update-docs Manuel Friedli 2015-01-18 17:01:37 +01:00
9218b331f9 Merge branch 'develop' into feature/update-toolchain Manuel Friedli 2015-01-18 16:52:55 +01:00
c1a17a315d Merge branch 'release' into develop Manuel Friedli 2015-01-18 16:52:08 +01:00
0684b57321 updated the version to 8.0.0-dev.0, as that's actually correct for a semver string; v7 has been released, so the next one needs to be 8.0.0-PRE or something; increasing major version because ôf backwards-incompatible changes Manuel Friedli 2015-01-18 16:50:11 +01:00
684f502cfd updated info/index.html Manuel Friedli 2015-01-18 16:44:28 +01:00
5bed926072 clarified the use of URL configuration and pointed out that the settings apply to all Uhr elements on a page. Manuel Friedli 2015-01-18 16:18:06 +01:00
1eb733b069 updated README.md to reflect the latest changes; also added new paragraph about the URL parameter configuration, which was forgotten in the previous releaseupdated README.md to reflect the latest changes; also added new paragraph about the URL parameter configuration, which was forgotten in the previous release.. Manuel Friedli 2015-01-18 16:14:23 +01:00
0c7aebc200 added the first two test methods that actually work! Manuel Friedli 2015-01-16 17:50:23 +01:00
51d21d8ff6 added a few more build targets: - base: includes the main uhr.js plus de_CH - baselangs: includes all languages except de_CH - complete: includes uhr.js and all languages (existed before) - langs: includes all languages (existed before) - main: includes only uhr.js (existed before) - libs: includes required libs: jquery, jquery-ui (core + widget), jquery-cookie Manuel Friedli 2015-01-16 15:48:51 +01:00
d0a28a0097 Merge branch 'develop' into feature/update-toolchain Manuel Friedli 2015-01-15 17:23:26 +01:00
9848cc4961 Merge branch 'feature/updatecharsetmetatag' into 'develop' Manuel Friedli 2015-01-15 17:21:37 +01:00
057d2a51a8 Merge branch 'develop' into feature/updatecharsetmetatag Manuel Friedli 2015-01-15 17:20:32 +01:00
319c08d74e Merge branch 'feature/no-appcache' into 'develop' Manuel Friedli 2015-01-15 17:15:48 +01:00
5932eba348 also updated the info/index.html file Manuel Friedli 2015-01-15 15:07:53 +01:00
a28df80158 deleted manifest.appcache and removed the attribute from the html tag. appcache causes a major headache on firefox, need to really look into that one day! Manuel Friedli 2015-01-15 15:05:50 +01:00
f9b6bd6117 - added lang=de to the html tag - changed the charset meta tag to the new and simpler HTML5 syntax Manuel Friedli 2015-01-15 15:04:06 +01:00
2e55875262 - updated version to a correct semver string - disable qunit in the default grunt task, as no tests are available yet and that causes the build to fail (i don't like the --force option) Manuel Friedli 2015-01-15 14:48:10 +01:00
fa79447259 fixed name of minified main js file Manuel Friedli 2015-01-13 20:16:32 +01:00
387a89dcbc "gruntified" the libraries, too. and updated the license and the version information in Gruntfile.js and package.json Manuel Friedli 2015-01-13 20:06:02 +01:00
351d9b6534 fixed the path in the HTML file Manuel Friedli 2015-01-13 19:52:04 +01:00
c990752abc corrected absolutely silly syntax error in Gruntfile.js and added /dist directory Manuel Friedli 2015-01-13 19:50:48 +01:00
018367f1ce first step of gruntifying/nodifying/bowerifying the whole thing Manuel Friedli 2015-01-12 18:49:30 +01:00
cde3551077 Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-12-08 00:00:50 +01:00
fca1b5a01a Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-12-08 00:00:49 +01:00
589751be5f increased version to next development cycle Manuel Friedli 2014-12-07 23:50:39 +01:00
b431a46dfb updated version to 7.0 v7.0 Manuel Friedli 2014-12-07 23:48:48 +01:00
02599b22af Merge branch 'feature/#17_urlparameters' into 'develop' Manuel Friedli 2014-12-07 23:46:29 +01:00
3b497435ae support long named parameters Manuel Friedli 2014-12-07 23:45:33 +01:00
f952690dd1 added parameters for mode and status Manuel Friedli 2014-12-07 13:03:34 +01:00
a444094779 first version of URL parameters. l=language, t=theme. Manuel Friedli 2014-12-07 12:59:33 +01:00
afe6da4371 Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-12-05 22:38:05 +01:00
6ad3b1dccb Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-12-05 22:37:46 +01:00
04b8fa02a8 updated version to 6.7-next for next dev cycle Manuel Friedli 2014-12-05 22:36:59 +01:00
4c867f50a7 updated version to 6.7 v6.7 Manuel Friedli 2014-12-05 22:35:31 +01:00
9669f25312 Merge branch 'develop' into release Manuel Friedli 2014-12-05 22:34:46 +01:00
3deaafaebe Merge branch 'bugfix/#14' into 'develop' Manuel Friedli 2014-12-05 22:30:11 +01:00
7dda927326 removed unnecessary variable; fixes #14 Manuel Friedli 2014-12-05 22:29:01 +01:00
c53f1479f2 Merge branch 'feature/lang-dk' into 'develop' Manuel Friedli 2014-12-05 22:26:08 +01:00
80864851eb minor re-formatting Manuel Friedli 2014-12-05 22:25:14 +01:00
6690ea4978 added danish translation and updated documentation accordingly Manuel Friedli 2014-12-05 22:15:09 +01:00
5c6b5a0e24 Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-12-05 21:07:42 +01:00