Commit graph

manuel/uhr

Fork 0

e5b9ab35aa Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-12-05 21:06:59 +01:00
2ac305c640 Merge branch 'develop' into 'master' v6.6 Manuel Friedli 2014-12-05 20:54:11 +01:00
78eea9ac1e Merge branch 'release/6.6' into 'develop' Manuel Friedli 2014-12-05 20:52:48 +01:00
284ec8fb8c updated version to 6.6 Manuel Friedli 2014-12-05 20:51:37 +01:00
58e93c0d6d Merge branch 'feature/lang-nl' into 'develop' Manuel Friedli 2014-12-05 20:43:08 +01:00
df856c22f7 fixed the info/index.html file Manuel Friedli 2014-12-05 20:41:21 +01:00
4e902cb6a1 updated version and fixed bugs in the NL translation Manuel Friedli 2014-11-24 12:40:17 +01:00
8ce86f4d4c added first version of dutch translation Manuel Friedli 2014-11-24 12:29:41 +01:00
36f0bdf93f Merge branch 'develop' into 'master' v6.5 Manuel Friedli 2014-11-20 03:53:18 +01:00
5cf26ca23a updated version to next release Manuel Friedli 2014-11-20 03:51:39 +01:00
18319d15e6 Merge branch 'feature/language-spanish' into 'develop' Manuel Friedli 2014-11-20 03:50:19 +01:00
4c6567cc0f updated version and manifest.appcache Manuel Friedli 2014-11-20 03:42:22 +01:00
72de912636 added spanish translation Manuel Friedli 2014-11-20 03:41:30 +01:00
bebb0f306d Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-10-22 00:36:05 +02:00
337fb6f238 Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-10-22 00:35:48 +02:00
0e137ec0b4 Merge branch 'develop' v6.4 Manuel Friedli 2014-10-22 00:01:32 +02:00
4ab7b71848 updated version Manuel Friedli 2014-10-22 00:01:17 +02:00
ae911be61d Merge branch 'feature/redo-controls-layout' into 'develop' Manuel Friedli 2014-10-21 23:56:19 +02:00
8a05f00f6e updated manifest version Manuel Friedli 2014-10-19 18:53:20 +02:00
c345209450 add some margin between control-button and control-panel Manuel Friedli 2014-10-19 18:52:19 +02:00
f6904bfdd5 first version of re-done config area. needs testing on mobile and other browsers than firefox. Manuel Friedli 2014-10-19 18:25:36 +02:00
e9d0d57c15 Merge branch 'feature/seconds-as-firstclass-citizens' into 'develop' Manuel Friedli 2014-10-18 17:23:10 +02:00
2a45b8fc0b updated manifest Manuel Friedli 2014-10-18 17:22:37 +02:00
665fc71dd3 Merge branch 'feature/seconds-as-firstclass-citizens' into 'develop' Manuel Friedli 2014-10-18 17:21:38 +02:00
ff4c90c673 updated documentation Manuel Friedli 2014-10-18 17:18:45 +02:00
92abc8e15b bugfix: initial display mode Manuel Friedli 2014-10-18 17:11:24 +02:00
9f37f1f971 removed de_CH-seconds layout Manuel Friedli 2014-10-18 16:45:33 +02:00
35eef98722 added new toggle switch for choosing between normal time mode and seconds mode Manuel Friedli 2014-10-18 16:44:36 +02:00
80df0d24cb corrected typo and incremented version to next snapshot Manuel Friedli 2014-10-17 21:13:02 +02:00
6f3c4a8e6b Merge branch 'develop' into feature/splashscreen Manuel Friedli 2014-09-03 15:38:00 +02:00
a0ca6228e2 Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-09-03 15:31:04 +02:00
3afc388856 Merge branch 'develop' into 'master' v6.3.3 Manuel Friedli 2014-09-03 15:24:52 +02:00
5f6f67cfef Merge branch 'release/6_3_3' into 'develop' Manuel Friedli 2014-09-03 15:23:57 +02:00
8a18858bd1 increment version number, update manifest.appcache Manuel Friedli 2014-09-03 15:18:24 +02:00
164ef0c6c3 Merge branch 'cleanup/frontpage_issue5' into 'develop' Manuel Friedli 2014-09-03 15:14:13 +02:00
72de1a90d7 Merge branch 'develop' into cleanup/frontpage_issue5 Manuel Friedli 2014-09-03 15:12:46 +02:00
cf9c6ab5f7 Merge branch 'feature/no-external-links' into 'develop' Manuel Friedli 2014-09-03 11:50:48 +02:00
87d2a01244 removed test.html Manuel Friedli 2014-09-02 18:55:09 +02:00
a5599242f6 replaced all important links with javascript links, thus effectively enabling the app to be a true offline app. Manuel Friedli 2014-09-02 18:53:20 +02:00
28670a66bb Merge branch 'develop' into feature/no-external-links Manuel Friedli 2014-09-02 18:41:03 +02:00
4ba32fc443 deleted the link to the showcase and the showcase directory itself. resolves issue #5. Manuel Friedli 2014-09-02 18:37:10 +02:00
7afe681ec2 updated version v6.3.2 Manuel Friedli 2014-08-28 08:53:09 +02:00
ef4ec5fc4b added $ to the closure Manuel Friedli 2014-08-28 08:50:19 +02:00
bc37a5cfa9 Merge branch 'develop' into feature/no-external-links Manuel Friedli 2014-08-26 18:29:28 +02:00
851c5cbddd Merge branch 'develop' into feature/new-splashscreen Manuel Friedli 2014-08-26 18:25:46 +02:00
4e98987653 Merge branch 'develop' into 'master' v6.3.1 Manuel Friedli 2014-08-26 18:18:08 +02:00
ed7f36552e updated version to 6.3.1 in preparation of release 6.3.1 (issue #4) Manuel Friedli 2014-08-26 18:15:18 +02:00
8d471226b4 Merge branch 'feature/cleanup' into 'develop' Manuel Friedli 2014-08-26 18:11:04 +02:00
3c22e2ab5f removed unnecessary options Manuel Friedli 2014-08-26 18:00:52 +02:00
9abfc59786 incremented the version Manuel Friedli 2014-08-26 17:50:33 +02:00
f171b9c8aa reformatted the whole code base Manuel Friedli 2014-08-26 17:49:23 +02:00
3e7451ac6d Merge branch 'develop' into feature/no-external-links Manuel Friedli 2014-08-26 17:18:42 +02:00
acbab837c1 updated manifest.appcache Manuel Friedli 2014-08-26 17:07:16 +02:00
5924f43d99 Merge branch 'master' into feature/new-splashscreen Manuel Friedli 2014-08-26 17:06:02 +02:00
f576347c06 Merge branch 'develop' into 'master' v6.3 Manuel Friedli 2014-08-26 16:29:53 +02:00
ced6306c30 updated version to 6.3 Manuel Friedli 2014-08-26 16:16:08 +02:00
6442a80d60 updated version Manuel Friedli 2014-08-26 15:57:31 +02:00
0bd5c3bc16 Merge branch 'develop' into feature/autoresize Manuel Friedli 2014-08-26 15:54:00 +02:00
28108572c4 added VERSION to manifest.appcache Manuel Friedli 2014-08-26 15:51:26 +02:00
8a6f336d9e added VERSION file Manuel Friedli 2014-08-26 15:50:13 +02:00
c885b15fcb Merge branch 'master' into develop Manuel Friedli 2014-08-21 16:50:43 +02:00
53831896bb added VERSION file Manuel Friedli 2014-08-21 16:50:31 +02:00
2edf130472 added autoresize option and updated documentation Manuel Friedli 2014-08-12 19:19:37 +02:00
e8a0bfe5be updated manifest.appcache Manuel Friedli 2014-08-12 18:23:46 +02:00
0a86959c32 Merge branch 'feature/seconds' into 'develop' Manuel Friedli 2014-08-12 18:22:05 +02:00
3f6a315208 tried to add newline let's see what happens Manuel Friedli 2014-08-12 18:20:45 +02:00
be1e1cf89b fixed line-endings in .gitignore Manuel Friedli 2014-08-12 11:59:06 +02:00
fcfdaaa2cd fade controls in and out Manuel Friedli 2014-08-12 11:55:34 +02:00
a3dce2322b don't remove blank line Manuel Friedli 2014-08-12 00:44:29 +02:00
dbbfae83b3 don't add trailing slash Manuel Friedli 2014-08-12 00:41:26 +02:00
79430a6821 old file, it's now at js/uhr.js Manuel Friedli 2014-08-12 00:39:13 +02:00
504e139bf2 adapted the changes on the seconds branch to the refactored code Manuel Friedli 2014-08-11 23:52:46 +02:00
020fc96036 Merge branch 'develop' into feature/seconds Manuel Friedli 2014-08-11 23:04:28 +02:00
3ef3ce346f Merge branch 'feature/config_in_popup' into 'develop' Manuel Friedli 2014-08-11 22:47:55 +02:00
072ef1e2d1 increased version to 7.0-alpha Manuel Friedli 2014-08-11 19:24:18 +02:00
c0742a6f11 make the clock adjust its size on window resizing Manuel Friedli 2014-08-11 19:19:11 +02:00
633401862f tweaked the info page Manuel Friedli 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 Manuel Friedli 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 Manuel Friedli 2014-08-11 17:36:53 +02:00
e03102172c updated manifest.appcache Manuel Friedli 2014-08-10 23:21:01 +02:00
6deb0d50fe converted controls into an overlay Manuel Friedli 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! Manuel Friedli 2014-08-09 12:15:01 +02:00
275234abd8 README.md angepasst Manuel Friedli 2014-08-09 11:41:43 +02:00
501dfb50be syntax fix Manuel Friedli 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. Manuel Friedli 2014-07-16 17:08:10 +02:00
a0e2588d91 added definitions for seconds Manuel Friedli 2014-07-16 16:45:00 +02:00
8badcc549f added first second-thing Manuel Friedli 2014-07-16 16:39:37 +02:00
69a843fc29 added example of seconds layout Manuel Friedli 2014-07-16 16:21:23 +02:00
689e348532 added IDEA files to ignore list Manuel Friedli 2014-07-16 15:58:50 +02:00
cca9e21d08 intermediate commit manuel 2014-07-04 21:51:39 +02:00
65e1466508 JSHinting manuel 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 ... manuel 2014-07-04 13:47:16 +02:00
b23a56f866 set up testing structure manuel 2014-07-04 01:08:39 +02:00
6f6feb5cf5 re-indented the code manuel 2014-07-04 00:52:09 +02:00
de75a3bdaf no more JSHint errors for now manuel 2014-07-04 00:50:16 +02:00
ec8a185dd7 more JSHinting manuel 2014-07-04 00:42:05 +02:00
cd58ff4ba3 converted many old-fashioned for-loops to modern ones manuel 2014-07-03 22:03:54 +02:00
dd752c8db0 use forEach() instead of for(i=0...) manuel 2014-07-03 21:26:13 +02:00
9720d1dcd1 accept "unsafe" line breaks manuel 2014-07-03 21:25:47 +02:00
df9e435da3 renamed _currentMinute to currentMinute manuel 2014-07-03 21:20:20 +02:00