Commit graph

500 commits

Author SHA1 Message Date
020fc96036 Merge branch 'develop' into feature/seconds
Conflicts:
	.gitignore
	manifest.appcache
	showcase/index.html
	uhr.js
2014-08-11 23:04:28 +02:00
3ef3ce346f Merge branch 'feature/config_in_popup' into 'develop'
Feature/config in popup

See merge request !18
2014-08-11 22:47:55 +02:00
072ef1e2d1 increased version to 7.0-alpha 2014-08-11 19:24:18 +02:00
c0742a6f11 make the clock adjust its size on window resizing 2014-08-11 19:19:11 +02:00
633401862f tweaked the info page 2014-08-11 18:10:38 +02:00
055cd4ff52 changed the order of stylesheets in README.md, to match the one used on
the main page
2014-08-11 17:41:36 +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
e03102172c updated manifest.appcache 2014-08-10 23:21:01 +02:00
6deb0d50fe converted controls into an overlay 2014-08-10 23:14:29 +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
275234abd8 README.md angepasst 2014-08-09 11:41:43 +02:00
501dfb50be syntax fix 2014-07-16 23:48:13 +02:00
c0af4a976f rename seconds-file; add more failsafety (undefined-checks); override
_getDotMinute for the second, so the dots don't show up.
2014-07-16 17:08:10 +02:00
a0e2588d91 added definitions for seconds 2014-07-16 16:45:00 +02:00
8badcc549f added first second-thing 2014-07-16 16:39:37 +02:00
69a843fc29 added example of seconds layout 2014-07-16 16:21:23 +02:00
689e348532 added IDEA files to ignore list 2014-07-16 15:58:50 +02:00
cca9e21d08 intermediate commit 2014-07-04 21:51:39 +02:00
65e1466508 JSHinting 2014-07-04 13:52:32 +02:00
be221aa88d use Function.bind() instead of passing the 'this' object to each and every
function. but that's no nice solution either ...
2014-07-04 13:47:16 +02:00
b23a56f866 set up testing structure 2014-07-04 01:08:39 +02:00
6f6feb5cf5 re-indented the code 2014-07-04 00:52:09 +02:00
de75a3bdaf no more JSHint errors for now 2014-07-04 00:50:16 +02:00
ec8a185dd7 more JSHinting 2014-07-04 00:42:05 +02:00
cd58ff4ba3 converted many old-fashioned for-loops to modern ones 2014-07-03 22:03:54 +02:00
dd752c8db0 use forEach() instead of for(i=0...) 2014-07-03 21:26:13 +02:00
9720d1dcd1 accept "unsafe" line breaks 2014-07-03 21:25:47 +02:00
df9e435da3 renamed _currentMinute to currentMinute 2014-07-03 21:20:20 +02:00
60e68ffeaf renamed _id to id 2014-07-03 21:18:27 +02:00
ec9b44427c renamed _timer to timer 2014-07-03 21:16:47 +02:00
08cca0a915 helper variables don't need to be wrapped in their own object. 2014-07-03 21:06:06 +02:00
3d0245abfa wrap the layout definitions in immediately executing anonymous functions 2014-07-03 20:37:34 +02:00
85b5670dfc removed the window.uhr global variable! hooray! 2014-07-03 20:33:26 +02:00
5a9ec0e0df basically the whole thing is rewritten :) 2014-07-03 20:10:55 +02:00
7b0e77f16f fixed syntax error. was probably introduced while refactoring 2014-07-03 20:09:01 +02:00
218a0f40e5 fixed the path to the font 2014-07-03 20:06:37 +02:00
09562d47a4 intermediate commit 2014-07-03 18:36:43 +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
f3d8aab61f Merge branch 'develop' into 'master'
Develop

hotfix
2014-06-28 23:46:44 +02:00
340669c5eb fixed 24h bug 2014-06-28 23:46:12 +02:00
0fb0551783 Merge branch 'develop' into 'master'
Develop

Configurable cookie path
2014-06-28 23:39:52 +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
9ffc1bec75 Merge branch 'develop' into 'master'
Develop
2014-06-28 23:14:32 +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