|
|
07b64480cd
|
Merge branch 'develop' into feature/fix-cookie-path
Conflicts:
manifest.appcache
|
2014-06-28 17:00:30 +02:00 |
|
|
|
8e7029759a
|
Merge branch 'develop' into feature/new-splashscreen
|
2014-06-28 16:59:40 +02:00 |
|
|
|
deb8f40080
|
Merge branch 'develop' into 'master'
Develop
Version 6.0
|
2014-06-28 16:51:57 +02:00 |
|
|
|
56f20907d9
|
Merge branch 'feature/refactor-layout-definition' into 'develop'
Feature/Refactor Layout Definition
|
2014-06-28 16:49:07 +02:00 |
|
|
|
f04d5a9aef
|
remove trailing newline
|
2014-06-28 16:47:44 +02:00 |
|
|
|
59c5b8d358
|
updated manifest, including the version
|
2014-06-28 16:44:03 +02:00 |
|
|
|
bb027261b2
|
register languages with help of a function. that enables advances functionality with fallback-language and makes it generally more robust.
this commit concludes the refactoring of the layout definition.
|
2014-06-28 16:40:24 +02:00 |
|
|
|
d9ae1f3783
|
removed unnecessary comma
|
2014-06-28 16:38:12 +02:00 |
|
|
|
2564eec812
|
added yellow theme
|
2014-06-28 16:04:06 +02:00 |
|
|
|
194ebc58de
|
fix sizing
|
2014-06-28 15:58:28 +02:00 |
|
|
|
480736e877
|
refactor: move every helper function inside the scope-limiting block in order not to pollute world
|
2014-06-28 15:53:08 +02:00 |
|
|
|
ffcf8fa2f2
|
added showcase
|
2014-06-28 15:52:48 +02:00 |
|
|
|
135a180e12
|
make cookie path configurable
|
2014-06-28 14:41:30 +02:00 |
|
|
|
d334101ae0
|
updated version in manifest.appcache
|
2014-06-28 14:36:46 +02:00 |
|
|
|
b45b6bcaad
|
use default cookie-path instead of /
|
2014-06-28 14:34:20 +02:00 |
|
|
|
96507d58a2
|
Merge branch 'develop' into feature/refactor-layout-definition
|
2014-06-28 14:23:29 +02:00 |
|
|
|
38ba4bd14b
|
Merge branch 'develop' into feature/new-splashscreen
Conflicts:
index.html
|
2014-06-28 14:22:49 +02:00 |
|
|
|
28b74b30c5
|
Merge branch 'develop' into 'master'
Develop
V5.1: auto-detect themes
|
2014-06-28 14:20:08 +02:00 |
|
|
|
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 |
|
|
|
4360f5aee1
|
Merge branch 'develop' into feature/new-splashscreen
Conflicts:
index.html
manifest.appcache
|
2014-06-28 02:14:50 +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 |
|
