Commit graph

9 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
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
afe923c136 some JSHint'ing and reorganizing of the project-structure 2014-07-03 16:53:28 +02:00
9971763697 added it layout and updated documentation and manifest.appcache 2014-06-28 22:50:42 +02:00
a378f45470 activate french in the showcase and update manifest 2014-06-28 22:06:15 +02:00
d9ae1f3783 removed unnecessary comma 2014-06-28 16:38:12 +02:00
2564eec812 added yellow theme 2014-06-28 16:04:06 +02:00
194ebc58de fix sizing 2014-06-28 15:58:28 +02:00
ffcf8fa2f2 added showcase 2014-06-28 15:52:48 +02:00