|
|
44345884a7
|
Merge branch 'develop' into feature/splashscreen
|
2014-06-30 15:48:48 +02:00 |
|
|
|
340669c5eb
|
fixed 24h bug
|
2014-06-28 23:46:12 +02:00 |
|
|
|
348177e52a
|
Merge branch 'feature/fix-cookie-path' into 'develop'
Feature/Fix Cookie Path
|
2014-06-28 23:32:27 +02:00 |
|
|
|
719a2a8343
|
update manifest version
|
2014-06-28 23:31:47 +02:00 |
|
|
|
c890429dd6
|
consider the path when setting a cookie, but make it overridable with the configuration parameter 'cookiePath'.
|
2014-06-28 23:27:41 +02:00 |
|
|
|
6047499a18
|
Merge branch 'develop' into feature/fix-cookie-path
|
2014-06-28 23:16:36 +02:00 |
|
|
|
4811367f46
|
deleted test.html
|
2014-06-28 23:14:09 +02:00 |
|
|
|
065d9a2853
|
update manifest version
|
2014-06-28 23:12:54 +02:00 |
|
|
|
bd3fb48b0d
|
find all stylesheets, not only those defined in the head.
|
2014-06-28 23:12:20 +02:00 |
|
|
|
9eba4192ed
|
Merge branch 'develop' into feature/fix-cookie-path
|
2014-06-28 23:07:26 +02:00 |
|
|
|
0461411c6a
|
Merge branch 'feature/lang-it' into 'develop'
Feature/Lang It
|
2014-06-28 22:52:12 +02:00 |
|
|
|
9971763697
|
added it layout and updated documentation and manifest.appcache
|
2014-06-28 22:50:42 +02:00 |
|
|
|
ff850fca64
|
Merge branch 'feature/lang-fr' into 'develop'
Feature/Lang Fr
|
2014-06-28 22:16:52 +02:00 |
|
|
|
120574c36b
|
i guess this version deserves a minor-version-bump, not only micro, as _normalizeHours() is gone.
|
2014-06-28 22:14:05 +02:00 |
|
|
|
e666350b3f
|
updated the documentation
|
2014-06-28 22:12:59 +02:00 |
|
|
|
a378f45470
|
activate french in the showcase and update manifest
|
2014-06-28 22:06:15 +02:00 |
|
|
|
f7defa96d5
|
added french layout
|
2014-06-28 22:04:24 +02:00 |
|
|
|
f93083c128
|
preparing to support languages that make a difference between AM and PM
|
2014-06-28 22:03:35 +02:00 |
|
|
|
bde19624b2
|
Merge branch 'develop' into feature/fix-cookie-path
|
2014-06-28 17:04:47 +02:00 |
|
|
|
75568578f6
|
deleted commented old stuff
|
2014-06-28 17:04:30 +02:00 |
|
|
|
07b64480cd
|
Merge branch 'develop' into feature/fix-cookie-path
Conflicts:
manifest.appcache
|
2014-06-28 17:00:30 +02:00 |
|
|
|
0aa50f1132
|
Merge branch 'develop' into feature/splashscreen
Conflicts:
uhr-de_CH.js
|
2014-06-28 16:58:13 +02:00 |
|
|
|
8ba7f1ba0f
|
Merge branch 'feature/splashscreen' of git.friedli.info:manuel/uhr into feature/splashscreen
Conflicts:
index.html
|
2014-06-28 16:57:38 +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 |
|
|
|
d3e4f67b8b
|
Merge branch 'develop' into feature/splashscreen
|
2014-06-28 14:21:26 +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 |
|
|
|
6ef4f36b07
|
Merge branch 'develop' into feature/splashscreen
|
2014-06-28 02:12:17 +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 |
|
