80857bd69a
Merge branch 'feature/update-toolchain' into feature/unify-versioninfo
2015-01-19 01:14:29 +01:00
2bc3298628
fixed typo
2015-01-19 01:11:41 +01:00
055cb6aca6
fixed path to the main uhr.css in the README.md
2015-01-19 01:09:38 +01:00
b8fbffdf3e
also invoke the version task on grunt buildonly.
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.
2015-01-19 01:01:06 +01:00
6692d2d6d9
Merge branch 'feature/update-toolchain' into feature/unify-versioninfo
...
Conflicts:
Gruntfile.js
2015-01-19 00:51:15 +01:00
316e045770
also minify the CSS files and store them in dist/
2015-01-19 00:42:16 +01:00
959e4a41aa
Merge branch 'feature/update-toolchain' into feature/unify-versioninfo
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.
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".
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)
2015-01-18 21:36:55 +01:00
2295283ba4
Merge branch 'feature/update-toolchain' into feature/unify-versioninfo
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.
2015-01-18 18:31:23 +01:00
5e85458936
added a manifest.appcache file; first draft.
2015-01-18 18:03:49 +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.
2015-01-18 17:24:17 +01:00
dfac2ae47a
executed grunt in order to update the version info in the dist/* files
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.
2015-01-18 17:11:32 +01:00
3c193c5472
Merge branch 'feature/update-toolchain' into feature/update-docs
2015-01-18 17:01:37 +01:00
9218b331f9
Merge branch 'develop' into feature/update-toolchain
...
Conflicts:
VERSION
2015-01-18 16:53:58 +01:00
c1a17a315d
Merge branch 'release' into develop
...
Conflicts:
manifest.appcache
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
2015-01-18 16:50:11 +01:00
684f502cfd
updated info/index.html
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.
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..
2015-01-18 16:14:23 +01:00
0c7aebc200
added the first two test methods that actually work!
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
updated info/index.html
2015-01-16 15:48:51 +01:00
d0a28a0097
Merge branch 'develop' into feature/update-toolchain
2015-01-15 17:23:26 +01:00
9848cc4961
Merge branch 'feature/updatecharsetmetatag' into 'develop'
...
Feature/updatecharsetmetatag
See merge request !38
2015-01-15 17:21:37 +01:00
057d2a51a8
Merge branch 'develop' into feature/updatecharsetmetatag
...
Conflicts:
index.html
info/index.html
2015-01-15 17:20:32 +01:00
319c08d74e
Merge branch 'feature/no-appcache' into 'develop'
...
Feature/no appcache
See merge request !39
2015-01-15 17:15:48 +01:00
5932eba348
also updated the info/index.html file
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!
2015-01-15 15:06:53 +01:00
f9b6bd6117
- added lang=de to the html tag
...
- changed the charset meta tag to the new and simpler HTML5 syntax
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)
2015-01-15 14:48:10 +01:00
fa79447259
fixed name of minified main js file
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
2015-01-13 20:06:02 +01:00
351d9b6534
fixed the path in the HTML file
2015-01-13 19:52:04 +01:00
c990752abc
corrected absolutely silly syntax error in Gruntfile.js and added /dist
...
directory
2015-01-13 19:50:48 +01:00
018367f1ce
first step of gruntifying/nodifying/bowerifying the whole thing
2015-01-12 18:49:30 +01:00
589751be5f
increased version to next development cycle
2014-12-07 23:50:39 +01:00
b431a46dfb
updated version to 7.0
2014-12-07 23:48:48 +01:00
02599b22af
Merge branch 'feature/#17_urlparameters' into 'develop'
...
Feature/#17 urlparameters
Add URL parameters. Fixes #17
See merge request !37
2014-12-07 23:46:29 +01:00
3b497435ae
support long named parameters
2014-12-07 23:45:33 +01:00
f952690dd1
added parameters for mode and status
2014-12-07 13:03:34 +01:00
a444094779
first version of URL parameters. l=language, t=theme.
2014-12-07 12:59:33 +01:00
04b8fa02a8
updated version to 6.7-next for next dev cycle
2014-12-05 22:36:59 +01:00
4c867f50a7
updated version to 6.7
2014-12-05 22:35:31 +01:00
9669f25312
Merge branch 'develop' into release
2014-12-05 22:34:46 +01:00
3deaafaebe
Merge branch 'bugfix/#14' into 'develop'
...
Bugfix/#14
See merge request !36
2014-12-05 22:30:11 +01:00
7dda927326
removed unnecessary variable; fixes #14
2014-12-05 22:29:01 +01:00
