Commit Graph

177 Commits

Author SHA1 Message Date
Manuel Friedli 135a180e12 make cookie path configurable 2014-06-28 14:41:30 +02:00
Manuel Friedli d334101ae0 updated version in manifest.appcache 2014-06-28 14:36:46 +02:00
Manuel Friedli b45b6bcaad use default cookie-path instead of / 2014-06-28 14:34:20 +02:00
Manuel Friedli 66287994ca Merge branch 'feature/css-auto-detect' into 'develop'
Feature/Css Auto Detect
2014-06-28 14:16:39 +02:00
Manuel Friedli fd940192f4 fixed (?) markdown 2014-06-28 14:13:47 +02:00
Manuel Friedli 7be99ce264 update documentation in README.md and incremented version in
manifest.appcache
2014-06-28 14:11:44 +02:00
Manuel Friedli fbf0217719 updated manifest.appcache version 2014-06-28 13:58:00 +02:00
Manuel Friedli 4c1ea9e1cd update documentation 2014-06-28 13:57:10 +02:00
Manuel Friedli ee60105130 only include required files 2014-06-28 13:56:55 +02:00
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli a4a440c8f0 deleted detector.js, it is integrated in uhr.js 2014-06-28 02:21:54 +02:00
Manuel Friedli 1a8e268a6a re-ordered head contents 2014-06-28 02:09:48 +02:00
Manuel Friedli 38df0a87c9 integrate detection in main file 2014-06-28 02:00:34 +02:00
Manuel Friedli 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
Manuel Friedli 455068d069 temporarily include detector.js 2014-06-28 00:52:55 +02:00
Manuel Friedli a72aacb504 first playground parsing the CSS names 2014-06-28 00:52:05 +02:00
Manuel Friedli 011e4cdf64 updated manifest.appcache 2014-06-27 13:44:59 +02:00
Manuel Friedli 32d19fe85e added pink style 2014-06-27 13:43:35 +02:00
Manuel Friedli dc098233fe changed the things according to the comments in the merge request 2014-06-20 01:57:06 +02:00
Manuel Friedli 8e0aaacbd8 updated manifest.appcache in preparation of release 5.0 2014-06-20 01:50:34 +02:00
Manuel Friedli ad50e9237a Merge branch 'develop' into feature/ios-app
Conflicts:
	index.html
2014-06-20 01:43:41 +02:00
Manuel Friedli ad809a6a6e new touch icon 2014-06-20 00:55:52 +02:00
Manuel Friedli 6b24cc3eb3 mark the icon as precomposed 2014-06-20 00:32:21 +02:00
Manuel Friedli 1b06330329 NOW it's good: initial-scale=1 2014-06-20 00:27:21 +02:00
Manuel Friedli c39ea30e9b perhaps it gets more readable on an iOS device like this 2014-06-20 00:25:58 +02:00
Manuel Friedli 50e4006a84 Merge branch 'bugfix/typos-layout' into 'develop'
Bugfix/Typos Layout
2014-06-20 00:16:53 +02:00
Manuel Friedli 8b5b343e35 corrected some typos and increased font-size on the info page
(cherry picked from commit e702aa6869ee9eed64271b71f3a48d2c4206f12f)
2014-06-20 00:14:20 +02:00
Manuel Friedli 2c5ac65bad updated manifest.appcache 2014-06-19 23:55:21 +02:00
Manuel Friedli 90e6d6d0f3 fixed various small things 2014-06-19 23:09:58 +02:00
Manuel Friedli aeeb197104 fixed HTML structure (un-closed p-tag)
removed link around clock
2014-05-15 15:20:48 +02:00
Manuel Friedli b4d67be48c added splash screen. doesn't show up yet, though. 2014-05-09 15:21:45 +02:00
Manuel Friedli 23411bc59b added splash screen for ios 2014-05-09 15:07:30 +02:00
Manuel Friedli a9f5667954 changed a-umlaut to REAL (utf-8) a-umlaut 2014-05-09 14:45:06 +02:00
Manuel Friedli c629833812 added home-icon for iOS 2014-05-09 14:42:26 +02:00
Manuel Friedli 8f9adbe567 added some neat tags for ios :) 2014-05-08 13:54:24 +02:00
Manuel Friedli 18460cfbbe updated manifest.appcache 2014-04-22 21:02:42 +02:00
Manuel Friedli 76cefba0fb Merge branch 'feature/info' into 'develop'
Feature/Info
2014-04-22 20:50:36 +02:00
Manuel Friedli 013c6c48c4 turned the clock in the info page into a link to root 2014-04-22 20:49:26 +02:00
Manuel Friedli cec282ed3e added link to fritteli.ch 2014-04-22 20:11:47 +02:00
Manuel Friedli 86c819534a corrected two typos 2014-04-22 20:11:05 +02:00
Manuel Friedli ec255aec1c fixed ol-numbering (nested style) 2014-03-05 23:09:50 +01:00
Manuel Friedli 5586771b0e Merge branch 'feature/info' of git.friedli.info:manuel/uhr into feature/info
Conflicts:
	info/index.html
2014-03-05 23:01:09 +01:00
Manuel Friedli 58f63c569a more info, better structured 2014-03-05 22:59:02 +01:00
Manuel Friedli 2703d21168 added dependency info 2014-03-05 22:09:39 +01:00
Manuel Friedli a9bd12fec0 added info-page 2014-03-05 22:09:39 +01:00
Manuel Friedli 7fcb77f60f Merge branch 'feature/update-libs' into 'develop'
Feature/Update Libs
2014-03-05 22:07:36 +01:00
Manuel Friedli d5469d95d2 updated jquery to 2.1.0 and jquery-ui to 1.10.4 2014-03-05 22:05:02 +01:00
Manuel Friedli 3233bcd017 added dependency info 2014-02-28 23:21:51 +01:00