Commit graph

64 commits

Author SHA1 Message Date
5924f43d99 Merge branch 'master' into feature/new-splashscreen
Conflicts:
	manifest.appcache
2014-08-26 17:06:02 +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
28108572c4 added VERSION to manifest.appcache 2014-08-26 15:51:26 +02:00
e8a0bfe5be updated manifest.appcache 2014-08-12 18:23:46 +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
072ef1e2d1 increased version to 7.0-alpha 2014-08-11 19:24:18 +02:00
e03102172c updated manifest.appcache 2014-08-10 23:21:01 +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
cbbe2e103d Merge branch 'develop' into feature/new-splashscreen 2014-06-30 15:49:02 +02:00
340669c5eb fixed 24h bug 2014-06-28 23:46:12 +02:00
719a2a8343 update manifest version 2014-06-28 23:31:47 +02:00
065d9a2853 update manifest version 2014-06-28 23:12:54 +02:00
9971763697 added it layout and updated documentation and manifest.appcache 2014-06-28 22:50:42 +02:00
120574c36b i guess this version deserves a minor-version-bump, not only micro, as _normalizeHours() is gone. 2014-06-28 22:14:05 +02:00
a378f45470 activate french in the showcase and update manifest 2014-06-28 22:06:15 +02:00
75568578f6 deleted commented old stuff 2014-06-28 17:04:30 +02:00
8e7029759a Merge branch 'develop' into feature/new-splashscreen 2014-06-28 16:59:40 +02:00
59c5b8d358 updated manifest, including the version 2014-06-28 16:44:03 +02:00
38ba4bd14b Merge branch 'develop' into feature/new-splashscreen
Conflicts:
	index.html
2014-06-28 14:22:49 +02:00
7be99ce264 update documentation in README.md and incremented version in
manifest.appcache
2014-06-28 14:11:44 +02:00
fbf0217719 updated manifest.appcache version 2014-06-28 13:58:00 +02:00
4360f5aee1 Merge branch 'develop' into feature/new-splashscreen
Conflicts:
	index.html
	manifest.appcache
2014-06-28 02:14:50 +02:00
011e4cdf64 updated manifest.appcache 2014-06-27 13:44:59 +02:00
dc098233fe changed the things according to the comments in the merge request 2014-06-20 01:57:06 +02:00
8e0aaacbd8 updated manifest.appcache in preparation of release 5.0 2014-06-20 01:50:34 +02:00
5b8a3bfd22 now trying with HTML meta tags. 2014-06-20 01:37:54 +02:00
dc9768ed2b updated manifest.appcache 2014-06-20 01:33:21 +02:00
6102097b50 deleted old splash screen 2014-06-20 01:21:04 +02:00
ad809a6a6e new touch icon 2014-06-20 00:55:52 +02:00
2c5ac65bad updated manifest.appcache 2014-06-19 23:55:21 +02:00
23411bc59b added splash screen for ios 2014-05-09 15:07:30 +02:00
c629833812 added home-icon for iOS 2014-05-09 14:42:26 +02:00
18460cfbbe updated manifest.appcache 2014-04-22 21:02:42 +02:00
0412ea17fc added functionality to hide controls 2014-01-20 15:47:13 +01:00
18c629f1e2 updated page title 2014-01-13 11:11:24 +01:00
8ce8167225 manifest aktualisiert 2014-01-11 23:17:18 +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
492d2a983e cleaned up the index.html and renamed jquery.cookie.js 2014-01-11 21:07:41 +01:00
0864a68f11 update d manifest 2014-01-11 21:00:47 +01:00
5cdadfc982 updated manifest 2013-12-17 21:52:55 +01:00
149073b668 updated manifest 2013-12-09 20:36:53 +01:00
042b282731 alle $ durch jQuery ersetzt 2013-12-01 16:42:42 +01:00
4308943177 update geflickt 2013-12-01 00:30:41 +01:00
91d3865dea manifest aktualisiert 2013-11-30 19:03:18 +01:00
93cef2c346 manifest aktualisiert 2013-11-29 14:34:04 +01:00
afda61ab0e removed obsolete files from manifest 2013-11-28 13:54:02 +01:00
41665c8ab0 manifest aktualisiert 2013-11-28 13:42:17 +01:00
6a6d1634dc manifest aktualisiert 2013-11-28 11:15:02 +01:00