Commit graph

472 commits

Author SHA1 Message Date
66287994ca Merge branch 'feature/css-auto-detect' into 'develop'
Feature/Css Auto Detect
2014-06-28 14:16:39 +02:00
fd940192f4 fixed (?) markdown 2014-06-28 14:13:47 +02:00
7be99ce264 update documentation in README.md and incremented version in
manifest.appcache
2014-06-28 14:11:44 +02:00
fbf0217719 updated manifest.appcache version 2014-06-28 13:58:00 +02:00
4c1ea9e1cd update documentation 2014-06-28 13:57:10 +02:00
ee60105130 only include required files 2014-06-28 13:56:55 +02:00
448747626c make auto-detection more robust and include a fallback if cookie or config
doesn't match available themes
2014-06-28 13:56:20 +02:00
ae3da935be only render selectors for language and theme if there is more than one
language / theme definition.
use the first defined theme as default if not explicitly specified.
2014-06-28 12:10:24 +02:00
1bc60d7a1b use data-class and data-name attributes on stylesheets to define
styleclass and pretty-name of themes
2014-06-28 10:54:28 +02:00
a4a440c8f0 deleted detector.js, it is integrated in uhr.js 2014-06-28 02:21:54 +02:00
1a8e268a6a re-ordered head contents 2014-06-28 02:09:48 +02:00
38df0a87c9 integrate detection in main file 2014-06-28 02:00:34 +02:00
09a53b0883 the order in which JS and CSS files are included MATTERS! autodetection of
themes works, as a first draft.
2014-06-28 01:04:53 +02:00
455068d069 temporarily include detector.js 2014-06-28 00:52:55 +02:00
a72aacb504 first playground parsing the CSS names 2014-06-28 00:52:05 +02:00
600b84c36a Merge branch 'develop' into feature/refactor-layout-definition 2014-06-27 13:45:24 +02:00
011e4cdf64 updated manifest.appcache 2014-06-27 13:44:59 +02:00
32d19fe85e added pink style 2014-06-27 13:43:35 +02:00
e5ce0ab2bb cache parsed layouts instead of re-parsing them every time the language
changes
2014-06-27 13:23:10 +02:00
a263a1f18c fixed hour3 + minutes45 to 49 2014-06-27 13:20:36 +02:00
29b280cf8b removed unnecessary array-brackets 2014-06-27 12:56:32 +02:00
fa1c6a1ea3 added comments 2014-06-27 12:55:31 +02:00
a9d8888f6a drop support for the old layout. only v2 supported as of now. 2014-06-27 12:44:38 +02:00
4942cfda2f deleted obsolete helper methods 2014-06-27 12:34:01 +02:00
d4874d1ec2 migrated en to v2 2014-06-27 12:28:19 +02:00
14d7ee79bc bugfix: when explicitly setting the time to a value with the same minute,
it didn't get updated.
2014-06-27 12:27:43 +02:00
c25a0d6c33 migrating en to v2, first step 2014-06-26 16:46:50 +02:00
c1961d7fca migrated de to v2 2014-06-26 16:38:30 +02:00
0c67a41116 fixed bug with minute 49 2014-06-26 16:37:43 +02:00
77ccc95b93 migrated normal de_CH layout to v2 2014-06-26 16:19:56 +02:00
428074b1f8 added missing semicolon 2014-06-26 16:19:18 +02:00
8f609294ff renamed _new to _genau 2014-06-26 16:06:23 +02:00
57556987ac renamed the helper renderer to _..., as per private naming convention 2014-06-26 16:01:42 +02:00
8234d4f3ea deleted unnecessary line 2014-06-26 16:01:25 +02:00
b9473f405f moved parsing of v2-layouts to own class 2014-06-26 15:52:08 +02:00
6d588aa08b bugfix for update in relation to fixed time; slight change in format of
layout definition.
2014-06-26 14:41:56 +02:00
f9b6acf8b6 improved handling of explicit time()-setting: no re-rendering, just update
the time and call _update(). that avoids flashing of the letters.
2014-06-26 14:13:21 +02:00
3e8252fa13 fixed a typo 2014-06-26 14:07:31 +02:00
eff9700864 first working version with some bugfixes! refactoring ensues ... 2014-06-26 13:46:10 +02:00
9a1160f66e deletes _TEST-file, working with the _new-file from now on. 2014-06-26 10:43:15 +02:00
10c07a05cf using a helper object works, as object properties cannot be accesses
before the object has been initialized.
2014-06-26 08:08:06 +02:00
0d90b3dd76 moved testing stuff to ownfiles. 2014-06-26 08:00:15 +02:00
b4f2a466b7 some debug output 2014-06-25 13:13:11 +02:00
d7c461f39a added new layout and first handling of it in the parser 2014-06-25 13:13:10 +02:00
78dcd7c66f Merge branch 'develop' into 'master'
Develop
2014-06-20 02:19:49 +02:00
dc098233fe changed the things according to the comments in the merge request 2014-06-20 01:57:06 +02:00
8e0aaacbd8 updated manifest.appcache in preparation of release 5.0 2014-06-20 01:50:34 +02:00
ad50e9237a Merge branch 'develop' into feature/ios-app
Conflicts:
	index.html
2014-06-20 01:43:41 +02:00
ad809a6a6e new touch icon 2014-06-20 00:55:52 +02:00
6b24cc3eb3 mark the icon as precomposed 2014-06-20 00:32:21 +02:00