|
|
bebb0f306d
|
Merge branch 'develop' into feature/splashscreen
|
2014-10-22 00:36:05 +02:00 |
|
|
|
4ab7b71848
|
updated version
|
2014-10-22 00:01:17 +02:00 |
|
|
|
ae911be61d
|
Merge branch 'feature/redo-controls-layout' into 'develop'
Feature/redo controls layout
This MR should fix #9 .
See merge request !29
|
2014-10-21 23:56:19 +02:00 |
|
|
|
8a05f00f6e
|
updated manifest version
|
2014-10-19 18:53:20 +02:00 |
|
|
|
c345209450
|
add some margin between control-button and control-panel
|
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.
|
2014-10-19 18:25:36 +02:00 |
|
|
|
e9d0d57c15
|
Merge branch 'feature/seconds-as-firstclass-citizens' into 'develop'
Feature/seconds as firstclass citizens
See merge request !28
|
2014-10-18 17:23:10 +02:00 |
|
|
|
2a45b8fc0b
|
updated manifest
|
2014-10-18 17:22:37 +02:00 |
|
|
|
665fc71dd3
|
Merge branch 'feature/seconds-as-firstclass-citizens' into 'develop'
Feature/seconds as firstclass citizens
This closes #8
See merge request !27
|
2014-10-18 17:21:38 +02:00 |
|
|
|
ff4c90c673
|
updated documentation
|
2014-10-18 17:18:45 +02:00 |
|
|
|
92abc8e15b
|
bugfix: initial display mode
|
2014-10-18 17:11:24 +02:00 |
|
|
|
9f37f1f971
|
removed de_CH-seconds layout
|
2014-10-18 16:45:33 +02:00 |
|
|
|
35eef98722
|
added new toggle switch for choosing between normal time mode and seconds mode
|
2014-10-18 16:44:36 +02:00 |
|
|
|
80df0d24cb
|
corrected typo and incremented version to next snapshot
|
2014-10-17 21:13:02 +02:00 |
|
|
|
6f3c4a8e6b
|
Merge branch 'develop' into feature/splashscreen
Conflicts:
index.html
uhr.js
|
2014-09-03 15:38:00 +02:00 |
|
|
|
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 |
|
|
|
8a18858bd1
|
increment version number, update manifest.appcache
|
2014-09-03 15:18:24 +02:00 |
|
|
|
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 |
|
|
|
72de1a90d7
|
Merge branch 'develop' into cleanup/frontpage_issue5
Conflicts:
index.html
|
2014-09-03 15:12:46 +02:00 |
|
|
|
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 |
|
|
|
87d2a01244
|
removed test.html
|
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.
|
2014-09-02 18:53:20 +02:00 |
|
|
|
28670a66bb
|
Merge branch 'develop' into feature/no-external-links
|
2014-09-02 18:41:03 +02:00 |
|
|
|
4ba32fc443
|
deleted the link to the showcase and the showcase directory itself.
resolves issue #5.
|
2014-09-02 18:37:10 +02:00 |
|
|
|
7afe681ec2
|
updated version
|
2014-08-28 08:53:09 +02:00 |
|
|
|
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 |
|
