Commit graph

377 commits

Author SHA1 Message Date
ef4ec5fc4b added $ to the closure 2014-08-28 08:50:19 +02:00
bc37a5cfa9 Merge branch 'develop' into feature/no-external-links
Conflicts:
	index.html
2014-08-26 18:29:28 +02:00
4e98987653 Merge branch 'develop' into 'master'
v6.3.1

See merge request !22
2014-08-26 18:18:08 +02:00
ed7f36552e updated version to 6.3.1 in preparation of release 6.3.1 (issue #4) 2014-08-26 18:15:18 +02:00
8d471226b4 Merge branch 'feature/cleanup' into 'develop'
Feature/cleanup

Fixes issue #3

See merge request !21
2014-08-26 18:11:04 +02:00
3c22e2ab5f removed unnecessary options 2014-08-26 18:00:52 +02:00
9abfc59786 incremented the version 2014-08-26 17:50:33 +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
f576347c06 Merge branch 'develop' into 'master'
v6.3

autoresize
seconds
config in overlay

See merge request !20
2014-08-26 16:29:53 +02:00
ced6306c30 updated version to 6.3 2014-08-26 16:16:08 +02:00
6442a80d60 updated version 2014-08-26 15:57:31 +02:00
0bd5c3bc16 Merge branch 'develop' into feature/autoresize
Conflicts:
	VERSION
2014-08-26 15:54:00 +02:00
28108572c4 added VERSION to manifest.appcache 2014-08-26 15:51:26 +02:00
8a6f336d9e added VERSION file 2014-08-26 15:50:13 +02:00
c885b15fcb Merge branch 'master' into develop 2014-08-21 16:50:43 +02:00
53831896bb added VERSION file 2014-08-21 16:50:31 +02:00
2edf130472 added autoresize option and updated documentation 2014-08-12 19:19:37 +02:00
e8a0bfe5be updated manifest.appcache 2014-08-12 18:23:46 +02:00
0a86959c32 Merge branch 'feature/seconds' into 'develop'
Feature/seconds

See merge request !19
2014-08-12 18:22:05 +02:00
3f6a315208 tried to add newline let's see what happens 2014-08-12 18:20:45 +02:00
be1e1cf89b fixed line-endings in .gitignore 2014-08-12 11:59:06 +02:00
fcfdaaa2cd fade controls in and out 2014-08-12 11:55:34 +02:00
a3dce2322b don't remove blank line 2014-08-12 00:44:29 +02:00
dbbfae83b3 don't add trailing slash 2014-08-12 00:41:26 +02:00
79430a6821 old file, it's now at js/uhr.js 2014-08-12 00:39:13 +02:00
504e139bf2 adapted the changes on the seconds branch to the refactored code 2014-08-11 23:52:46 +02:00
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