4ff55d967e
updated README.md to use syntax highlighting in the markdown
2016-05-17 22:16:39 +02:00
a261d807cc
Merge branch 'bugfix/build-failure' into 'develop'
...
Bugfix/build failure
Fixed the build failure. Lifted all dependencies to their latest versions.
See merge request !45
2015-10-07 19:50:35 +02:00
2daf130c68
updated all dependencies to the latest available versions and re-generated some files in dist/
2015-10-07 19:43:41 +02:00
04afcad428
okay, so deleting these dirs is not required
2015-10-07 19:16:03 +02:00
3b2fcbe16e
tried to fix .gitlab-ci.yml
2015-10-07 19:14:09 +02:00
fcf16cc80e
renamed COPYING to LICENSE
2015-10-07 19:00:37 +02:00
2bc132b76b
incremented version to next dev: 8.0.2-dev.0
2015-07-15 20:02:05 +02:00
f07ccb9918
updated version to next release, 8.0.1
2015-07-15 17:51:13 +02:00
5db6f042cf
Merge branch 'feature/language-pt' into 'develop'
...
Feature/language pt
See merge request !44
2015-07-15 17:47:54 +02:00
b98913ccf8
added dist-files
2015-07-15 17:43:35 +02:00
5944c3d487
added "fast forward" test page and added license header to the existing
...
test file
2015-07-15 17:36:17 +02:00
250a5beb73
Merge branch 'develop' into feature/language-pt
2015-07-14 00:53:31 +02:00
672c453b90
added dist-files for portuguese
2015-07-14 00:39:34 +02:00
7c227ef572
corrected language string
2015-07-14 00:39:08 +02:00
2ab2e36349
added dist-files for portuguese language
2015-07-14 00:38:07 +02:00
2f57cb4054
Merge branch 'feature/gitlab-ci-yml' into 'develop'
...
added .gitlab-ci.yml build descriptor
See merge request !43
2015-07-14 00:09:47 +02:00
9ead720de6
added .gitlab-ci.yml build descriptor
2015-07-14 00:06:29 +02:00
e19e11e4d6
added portuguese translation
2015-07-13 23:53:44 +02:00
6e7e5afc55
Merge branch 'bugfix/issue-28-fix-readme' into 'develop'
...
fixed paragraph 6 in the README.md. this fixes #28
See merge request !42
2015-06-17 00:11:19 +02:00
11495c1cca
fixed paragraph 6 in the README.md. this fixes #28
2015-06-17 00:05:30 +02:00
e104df7aa9
increment version number to next dev cycle
2015-01-19 01:57:40 +01:00
76a97046c8
incremented version to 8.0.0
2015-01-19 01:54:29 +01:00
2344a400d8
Merge branch 'feature/update-toolchain' into 'develop'
...
Feature/update toolchain
This will fix #19 , #20 , #21 .
See merge request !41
2015-01-19 01:50:46 +01:00
ef6d48b906
Merge branch 'feature/unify-versioninfo' into 'feature/update-toolchain'
...
Feature/unify versioninfo
This will fix #21 .
See merge request !40
2015-01-19 01:19:54 +01:00
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
