|
|
afe6da4371
|
Merge branch 'develop' into feature/splashscreen
|
2014-12-05 22:38:05 +01:00 |
|
|
|
6690ea4978
|
added danish translation and updated documentation accordingly
|
2014-12-05 22:15:09 +01:00 |
|
|
|
5c6b5a0e24
|
Merge branch 'develop' into feature/splashscreen
|
2014-12-05 21:07:42 +01:00 |
|
|
|
4e902cb6a1
|
updated version and fixed bugs in the NL translation
|
2014-11-24 12:40:17 +01:00 |
|
|
|
72de912636
|
added spanish translation
|
2014-11-20 03:41:30 +01:00 |
|
|
|
bebb0f306d
|
Merge branch 'develop' into feature/splashscreen
|
2014-10-22 00:36:05 +02:00 |
|
|
|
9f37f1f971
|
removed de_CH-seconds layout
|
2014-10-18 16:45:33 +02:00 |
|
|
|
6f3c4a8e6b
|
Merge branch 'develop' into feature/splashscreen
Conflicts:
index.html
uhr.js
|
2014-09-03 15:38:00 +02:00 |
|
|
|
72de1a90d7
|
Merge branch 'develop' into cleanup/frontpage_issue5
Conflicts:
index.html
|
2014-09-03 15:12:46 +02:00 |
|
|
|
a5599242f6
|
replaced all important links with javascript links, thus effectively enabling the
app to be a true offline app.
|
2014-09-02 18:53:20 +02:00 |
|
|
|
4ba32fc443
|
deleted the link to the showcase and the showcase directory itself.
resolves issue #5.
|
2014-09-02 18:37:10 +02:00 |
|
|
|
bc37a5cfa9
|
Merge branch 'develop' into feature/no-external-links
Conflicts:
index.html
|
2014-08-26 18:29:28 +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 |
|
|
|
3e7451ac6d
|
Merge branch 'develop' into feature/no-external-links
Conflicts:
index.html
|
2014-08-26 17:18:42 +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 |
|
|
|
501dfb50be
|
syntax fix
|
2014-07-16 23:48:13 +02:00 |
|
|
|
afe923c136
|
some JSHint'ing and reorganizing of the project-structure
|
2014-07-03 16:53:28 +02:00 |
|
|
|
e316557ac8
|
added script which should convert normal links into javascript links
|
2014-07-02 19:21:50 +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 |
|
|
|
ffcf8fa2f2
|
added showcase
|
2014-06-28 15:52:48 +02:00 |
|
|
|
d3e4f67b8b
|
Merge branch 'develop' into feature/splashscreen
|
2014-06-28 14:21:26 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
1bdde279de
|
temp commit, creating splash screen
|
2014-06-20 01:17:09 +02:00 |
|
|
|
ad809a6a6e
|
new touch icon
|
2014-06-20 00:55:52 +02:00 |
|
|
|
ef073f9eb5
|
temp commit for logo-generation
|
2014-06-20 00:53:57 +02:00 |
|
|
|
5ccc66da8c
|
Merge branch 'develop' into feature/splashscreen
|
2014-06-19 23:58:07 +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 |
|
|
|
3126af0018
|
temp commit
|
2014-05-09 15:06:20 +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 |
|
