|
851c5cbddd
|
Merge branch 'develop' into feature/new-splashscreen
Conflicts:
index.html
|
2014-08-26 18:25:46 +02:00 |
|
|
3c22e2ab5f
|
removed unnecessary options
|
2014-08-26 18:00:52 +02:00 |
|
|
f171b9c8aa
|
reformatted the whole code base
|
2014-08-26 17:49:23 +02:00 |
|
|
5924f43d99
|
Merge branch 'master' into feature/new-splashscreen
Conflicts:
manifest.appcache
|
2014-08-26 17:06:02 +02:00 |
|
|
2edf130472
|
added autoresize option and updated documentation
|
2014-08-12 19:19:37 +02:00 |
|
|
504e139bf2
|
adapted the changes on the seconds branch to the refactored code
|
2014-08-11 23:52:46 +02:00 |
|
|
c0742a6f11
|
make the clock adjust its size on window resizing
|
2014-08-11 19:19:11 +02:00 |
|
|
fa0da37425
|
make the control panel full-size on narrow (<=400px) screens, and include
all colors and languages on the main page
|
2014-08-11 17:36:53 +02:00 |
|
|
27435ed9a8
|
put controls in their own div element and hide/show it with action links.
now to do: css styling!
|
2014-08-09 12:15:01 +02:00 |
|
|
afe923c136
|
some JSHint'ing and reorganizing of the project-structure
|
2014-07-03 16:53:28 +02:00 |
|
|
8e7029759a
|
Merge branch 'develop' into feature/new-splashscreen
|
2014-06-28 16:59:40 +02:00 |
|
|
ffcf8fa2f2
|
added showcase
|
2014-06-28 15:52:48 +02:00 |
|
|
38ba4bd14b
|
Merge branch 'develop' into feature/new-splashscreen
Conflicts:
index.html
|
2014-06-28 14:22:49 +02:00 |
|
|
ee60105130
|
only include required files
|
2014-06-28 13:56:55 +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 |
|
|
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 |
|
|
32d19fe85e
|
added pink style
|
2014-06-27 13:43:35 +02:00 |
|
|
dc098233fe
|
changed the things according to the comments in the merge request
|
2014-06-20 01:57:06 +02:00 |
|
|
5b8a3bfd22
|
now trying with HTML meta tags.
|
2014-06-20 01:37:54 +02:00 |
|
|
229bf3ef8e
|
added new splash screens
|
2014-06-20 01:18:50 +02:00 |
|
|
ad809a6a6e
|
new touch icon
|
2014-06-20 00:55:52 +02:00 |
|
|
aeeb197104
|
fixed HTML structure (un-closed p-tag)
removed link around clock
|
2014-05-15 15:20:48 +02:00 |
|
|
b4d67be48c
|
added splash screen. doesn't show up yet, though.
|
2014-05-09 15:21:45 +02:00 |
|
|
23411bc59b
|
added splash screen for ios
|
2014-05-09 15:07:30 +02:00 |
|
|
a9f5667954
|
changed a-umlaut to REAL (utf-8) a-umlaut
|
2014-05-09 14:45:06 +02:00 |
|
|
c629833812
|
added home-icon for iOS
|
2014-05-09 14:42:26 +02:00 |
|
|
8f9adbe567
|
added some neat tags for ios :)
|
2014-05-08 13:54:24 +02:00 |
|
|
cec282ed3e
|
added link to fritteli.ch
|
2014-04-22 20:11:47 +02:00 |
|
|
a9bd12fec0
|
added info-page
|
2014-03-05 22:09:39 +01:00 |
|
|
d5469d95d2
|
updated jquery to 2.1.0 and jquery-ui to 1.10.4
|
2014-03-05 22:05:02 +01:00 |
|
|
18c629f1e2
|
updated page title
|
2014-01-13 11:11:24 +01:00 |
|
|
d51b00fece
|
go back to standard behavior for index.html: one simple Bärneruhr
|
2014-01-11 23:16:20 +01:00 |
|
|
831f1facd7
|
time() funktion implementiert; damit kann eine fixe zeit gesetzt werden. noch nicht ganz ausgereift.
|
2014-01-11 22:54:46 +01:00 |
|
|
9710663b1d
|
added favicon
|
2014-01-11 22:09:52 +01:00 |
|
|
492d2a983e
|
cleaned up the index.html and renamed jquery.cookie.js
|
2014-01-11 21:07:41 +01:00 |
|
|
e995a2f224
|
jQuery-Plugin ist nun mit jQuery UI widget builder (oder wie das heisst) implementiert. viel schöner!!!
|
2014-01-11 20:56:21 +01:00 |
|
|
fc2c8ac38a
|
es funzt! nun muss ich aufräumen und das ganze noch RICHTIG machen.
|
2014-01-11 12:18:11 +01:00 |
|
|
9db6473085
|
tried to convert it, now it's a mess
|
2014-01-11 03:26:53 +01:00 |
|
|
ebc82f4eff
|
improved default site and fixed JS error; need to tackle that again, though
|
2013-12-17 21:50:28 +01:00 |
|
|
042b282731
|
alle $ durch jQuery ersetzt
|
2013-12-01 16:42:42 +01:00 |
|
|
cc7c805168
|
grösse lässt sich nun konfigurieren
|
2013-11-30 18:51:43 +01:00 |
|
|
c8e24d1314
|
css-klasse "uhr" automatisch hinzufügen"
|
2013-11-29 14:31:08 +01:00 |
|
|
5479714842
|
vernünftige default-werte gesetzt
|
2013-11-28 13:41:14 +01:00 |
|
|
77c660fcff
|
toggle-switch auch farbig, und vorallem pro uhr
|
2013-11-28 09:57:50 +01:00 |
|
|
5223ceb1f6
|
commit, weil ich wissen muss, obs an den cookies liegt, dass es nicht geht
|
2013-11-28 08:51:37 +01:00 |
|
|
bb60117dcf
|
erster schritt, layout-dropdown dynamisch zu laden
|
2013-11-27 18:37:38 +01:00 |
|