manuel
/
uhr
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
489 Commits 11 Branches 32 Tags 7.4 MiB
Commit Graph

489 Commits

Author SHA1 Message Date
Manuel Friedli 80df0d24cb corrected typo and incremented version to next snapshot 2014-10-17 21:13:02 +02:00
Manuel Friedli 3afc388856 Merge branch 'develop' into 'master' 
Develop

See merge request !26
 2014-09-03 15:24:52 +02:00
Manuel Friedli 5f6f67cfef Merge branch 'release/6_3_3' into 'develop' 
Release/6 3 3

merge release branch into develop

See merge request !25
 2014-09-03 15:23:57 +02:00
Manuel Friedli 8a18858bd1 increment version number, update manifest.appcache 2014-09-03 15:18:24 +02:00
Manuel Friedli 164ef0c6c3 Merge branch 'cleanup/frontpage_issue5' into 'develop' 
Cleanup/frontpage issue5

fixes #5

See merge request !23
 2014-09-03 15:14:13 +02:00
Manuel Friedli 72de1a90d7 Merge branch 'develop' into cleanup/frontpage_issue5 
Conflicts:
	index.html
 2014-09-03 15:12:46 +02:00
Manuel Friedli cf9c6ab5f7 Merge branch 'feature/no-external-links' into 'develop' 
Feature/no external links

See merge request !24
 2014-09-03 11:50:48 +02:00
Manuel Friedli 87d2a01244 removed test.html 2014-09-02 18:55:09 +02:00
Manuel Friedli 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
Manuel Friedli 28670a66bb Merge branch 'develop' into feature/no-external-links 2014-09-02 18:41:03 +02:00
Manuel Friedli 4ba32fc443 deleted the link to the showcase and the showcase directory itself. 
resolves issue #5.
 2014-09-02 18:37:10 +02:00
Manuel Friedli 7afe681ec2 updated version 2014-08-28 08:53:09 +02:00
Manuel Friedli ef4ec5fc4b added $ to the closure 2014-08-28 08:50:19 +02:00
Manuel Friedli bc37a5cfa9 Merge branch 'develop' into feature/no-external-links 
Conflicts:
	index.html
 2014-08-26 18:29:28 +02:00
Manuel Friedli 4e98987653 Merge branch 'develop' into 'master' 
v6.3.1

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

Fixes issue #3

See merge request !21
 2014-08-26 18:11:04 +02:00
Manuel Friedli 3c22e2ab5f removed unnecessary options 2014-08-26 18:00:52 +02:00
Manuel Friedli 9abfc59786 incremented the version 2014-08-26 17:50:33 +02:00
Manuel Friedli f171b9c8aa reformatted the whole code base 2014-08-26 17:49:23 +02:00
Manuel Friedli 3e7451ac6d Merge branch 'develop' into feature/no-external-links 
Conflicts:
	index.html
 2014-08-26 17:18:42 +02:00
Manuel Friedli 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
Manuel Friedli ced6306c30 updated version to 6.3 2014-08-26 16:16:08 +02:00
Manuel Friedli 6442a80d60 updated version 2014-08-26 15:57:31 +02:00
Manuel Friedli 0bd5c3bc16 Merge branch 'develop' into feature/autoresize 
Conflicts:
	VERSION
 2014-08-26 15:54:00 +02:00
Manuel Friedli 28108572c4 added VERSION to manifest.appcache 2014-08-26 15:51:26 +02:00
Manuel Friedli 8a6f336d9e added VERSION file 2014-08-26 15:50:13 +02:00
Manuel Friedli c885b15fcb Merge branch 'master' into develop 2014-08-21 16:50:43 +02:00
Manuel Friedli 53831896bb added VERSION file 2014-08-21 16:50:31 +02:00
Manuel Friedli 2edf130472 added autoresize option and updated documentation 2014-08-12 19:19:37 +02:00
Manuel Friedli e8a0bfe5be updated manifest.appcache 2014-08-12 18:23:46 +02:00
Manuel Friedli 0a86959c32 Merge branch 'feature/seconds' into 'develop' 
Feature/seconds

See merge request !19
 2014-08-12 18:22:05 +02:00
Manuel Friedli 3f6a315208 tried to add newline let's see what happens 2014-08-12 18:20:45 +02:00
Manuel Friedli be1e1cf89b fixed line-endings in .gitignore 2014-08-12 11:59:06 +02:00
Manuel Friedli fcfdaaa2cd fade controls in and out 2014-08-12 11:55:34 +02:00
Manuel Friedli a3dce2322b don't remove blank line 2014-08-12 00:44:29 +02:00
Manuel Friedli dbbfae83b3 don't add trailing slash 2014-08-12 00:41:26 +02:00
Manuel Friedli 79430a6821 old file, it's now at js/uhr.js 2014-08-12 00:39:13 +02:00
Manuel Friedli 504e139bf2 adapted the changes on the seconds branch to the refactored code 2014-08-11 23:52:46 +02:00
Manuel Friedli 020fc96036 Merge branch 'develop' into feature/seconds 
Conflicts:
	.gitignore
	manifest.appcache
	showcase/index.html
	uhr.js
 2014-08-11 23:04:28 +02:00
Manuel Friedli 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
Manuel Friedli 072ef1e2d1 increased version to 7.0-alpha 2014-08-11 19:24:18 +02:00
Manuel Friedli c0742a6f11 make the clock adjust its size on window resizing 2014-08-11 19:19:11 +02:00
Manuel Friedli 633401862f tweaked the info page 2014-08-11 18:10:38 +02:00
Manuel Friedli 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
Manuel Friedli 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
Manuel Friedli e03102172c updated manifest.appcache 2014-08-10 23:21:01 +02:00
Manuel Friedli 6deb0d50fe converted controls into an overlay 2014-08-10 23:14:29 +02:00
Manuel Friedli 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
Manuel Friedli 275234abd8 README.md angepasst 2014-08-09 11:41:43 +02:00