manuel
/
uhr
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
407 Commits 11 Branches 32 Tags 7.4 MiB
Commit Graph

407 Commits

Author SHA1 Message Date
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli 5e85458936 added a manifest.appcache file; first draft. 2015-01-18 18:03:49 +01:00
Manuel Friedli dfac2ae47a executed grunt in order to update the version info in the dist/* files 2015-01-18 17:17:17 +01:00
Manuel Friedli 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
Manuel Friedli 3c193c5472 Merge branch 'feature/update-toolchain' into feature/update-docs 2015-01-18 17:01:37 +01:00
Manuel Friedli 9218b331f9 Merge branch 'develop' into feature/update-toolchain 
Conflicts:
	VERSION
 2015-01-18 16:53:58 +01:00
Manuel Friedli c1a17a315d Merge branch 'release' into develop 
Conflicts:
	manifest.appcache
 2015-01-18 16:52:08 +01:00
Manuel Friedli 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
Manuel Friedli 684f502cfd updated info/index.html 2015-01-18 16:44:28 +01:00
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli 0c7aebc200 added the first two test methods that actually work! 2015-01-16 17:50:23 +01:00
Manuel Friedli 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
Manuel Friedli d0a28a0097 Merge branch 'develop' into feature/update-toolchain 2015-01-15 17:23:26 +01:00
Manuel Friedli 9848cc4961 Merge branch 'feature/updatecharsetmetatag' into 'develop' 
Feature/updatecharsetmetatag

See merge request !38
 2015-01-15 17:21:37 +01:00
Manuel Friedli 057d2a51a8 Merge branch 'develop' into feature/updatecharsetmetatag 
Conflicts:
	index.html
	info/index.html
 2015-01-15 17:20:32 +01:00
Manuel Friedli 319c08d74e Merge branch 'feature/no-appcache' into 'develop' 
Feature/no appcache

See merge request !39
 2015-01-15 17:15:48 +01:00
Manuel Friedli 5932eba348 also updated the info/index.html file 2015-01-15 15:07:53 +01:00
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli fa79447259 fixed name of minified main js file 2015-01-13 20:16:32 +01:00
Manuel Friedli 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
Manuel Friedli 351d9b6534 fixed the path in the HTML file 2015-01-13 19:52:04 +01:00
Manuel Friedli c990752abc corrected absolutely silly syntax error in Gruntfile.js and added /dist 
directory
 2015-01-13 19:50:48 +01:00
Manuel Friedli 018367f1ce first step of gruntifying/nodifying/bowerifying the whole thing 2015-01-12 18:49:30 +01:00
Manuel Friedli 589751be5f increased version to next development cycle 2014-12-07 23:50:39 +01:00
Manuel Friedli b431a46dfb updated version to 7.0 2014-12-07 23:48:48 +01:00
Manuel Friedli 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
Manuel Friedli 3b497435ae support long named parameters 2014-12-07 23:45:33 +01:00
Manuel Friedli f952690dd1 added parameters for mode and status 2014-12-07 13:03:34 +01:00
Manuel Friedli a444094779 first version of URL parameters. l=language, t=theme. 2014-12-07 12:59:33 +01:00
Manuel Friedli 04b8fa02a8 updated version to 6.7-next for next dev cycle 2014-12-05 22:36:59 +01:00
Manuel Friedli 4c867f50a7 updated version to 6.7 2014-12-05 22:35:31 +01:00
Manuel Friedli 9669f25312 Merge branch 'develop' into release 2014-12-05 22:34:46 +01:00
Manuel Friedli 3deaafaebe Merge branch 'bugfix/#14' into 'develop' 
Bugfix/#14

See merge request !36
 2014-12-05 22:30:11 +01:00
Manuel Friedli 7dda927326 removed unnecessary variable; fixes #14 2014-12-05 22:29:01 +01:00
Manuel Friedli c53f1479f2 Merge branch 'feature/lang-dk' into 'develop' 
Feature/lang dk

Fixes #15

See merge request !35
 2014-12-05 22:26:08 +01:00
Manuel Friedli 80864851eb minor re-formatting 2014-12-05 22:25:14 +01:00
Manuel Friedli 6690ea4978 added danish translation and updated documentation accordingly 2014-12-05 22:15:09 +01:00
Manuel Friedli 2ac305c640 Merge branch 'develop' into 'master' 
Develop

This will fix #13 (as soon as the tag is made).

See merge request !34
 2014-12-05 20:54:11 +01:00
Manuel Friedli 78eea9ac1e Merge branch 'release/6.6' into 'develop' 
Release/6.6

See merge request !33
 2014-12-05 20:52:48 +01:00
Manuel Friedli 284ec8fb8c updated version to 6.6 2014-12-05 20:51:37 +01:00
Manuel Friedli 58e93c0d6d Merge branch 'feature/lang-nl' into 'develop' 
Feature/lang nl

See merge request !32

Fixes #12
 2014-12-05 20:43:08 +01:00
Manuel Friedli df856c22f7 fixed the info/index.html file 2014-12-05 20:41:21 +01:00
Manuel Friedli 4e902cb6a1 updated version and fixed bugs in the NL translation 2014-11-24 12:40:17 +01:00
Manuel Friedli 8ce86f4d4c added first version of dutch translation 2014-11-24 12:29:41 +01:00