c1a17a315d
Merge branch 'release' into develop
...
Conflicts:
manifest.appcache
2015-01-18 16:52:08 +01:00
0684b57321
updated the version to 8.0.0-dev.0, as that's actually correct for a
...
semver string; v7 has been released, so the next one needs to be
8.0.0-PRE or something; increasing major version because ôf
backwards-incompatible changes
2015-01-18 16:50:11 +01:00
9848cc4961
Merge branch 'feature/updatecharsetmetatag' into 'develop'
...
Feature/updatecharsetmetatag
See merge request !38
2015-01-15 17:21:37 +01:00
057d2a51a8
Merge branch 'develop' into feature/updatecharsetmetatag
...
Conflicts:
index.html
info/index.html
2015-01-15 17:20:32 +01:00
319c08d74e
Merge branch 'feature/no-appcache' into 'develop'
...
Feature/no appcache
See merge request !39
2015-01-15 17:15:48 +01:00
5932eba348
also updated the info/index.html file
2015-01-15 15:07:53 +01:00
a28df80158
deleted manifest.appcache and removed the attribute from the html tag.
...
appcache causes a major headache on firefox, need to really look into
that one day!
2015-01-15 15:06:53 +01:00
f9b6bd6117
- added lang=de to the html tag
...
- changed the charset meta tag to the new and simpler HTML5 syntax
2015-01-15 15:04:06 +01:00
589751be5f
increased version to next development cycle
2014-12-07 23:50:39 +01:00
b431a46dfb
updated version to 7.0
2014-12-07 23:48:48 +01:00
02599b22af
Merge branch 'feature/#17_urlparameters' into 'develop'
...
Feature/#17 urlparameters
Add URL parameters. Fixes #17
See merge request !37
2014-12-07 23:46:29 +01:00
3b497435ae
support long named parameters
2014-12-07 23:45:33 +01:00
f952690dd1
added parameters for mode and status
2014-12-07 13:03:34 +01:00
a444094779
first version of URL parameters. l=language, t=theme.
2014-12-07 12:59:33 +01:00
04b8fa02a8
updated version to 6.7-next for next dev cycle
2014-12-05 22:36:59 +01:00
4c867f50a7
updated version to 6.7
2014-12-05 22:35:31 +01:00
9669f25312
Merge branch 'develop' into release
2014-12-05 22:34:46 +01:00
3deaafaebe
Merge branch 'bugfix/#14' into 'develop'
...
Bugfix/#14
See merge request !36
2014-12-05 22:30:11 +01:00
7dda927326
removed unnecessary variable; fixes #14
2014-12-05 22:29:01 +01:00
c53f1479f2
Merge branch 'feature/lang-dk' into 'develop'
...
Feature/lang dk
Fixes #15
See merge request !35
2014-12-05 22:26:08 +01:00
80864851eb
minor re-formatting
2014-12-05 22:25:14 +01:00
6690ea4978
added danish translation and updated documentation accordingly
2014-12-05 22:15:09 +01:00
2ac305c640
Merge branch 'develop' into 'master'
...
Develop
This will fix #13 (as soon as the tag is made).
See merge request !34
2014-12-05 20:54:11 +01:00
78eea9ac1e
Merge branch 'release/6.6' into 'develop'
...
Release/6.6
See merge request !33
2014-12-05 20:52:48 +01:00
284ec8fb8c
updated version to 6.6
2014-12-05 20:51:37 +01:00
58e93c0d6d
Merge branch 'feature/lang-nl' into 'develop'
...
Feature/lang nl
See merge request !32
Fixes #12
2014-12-05 20:43:08 +01:00
df856c22f7
fixed the info/index.html file
2014-12-05 20:41:21 +01:00
4e902cb6a1
updated version and fixed bugs in the NL translation
2014-11-24 12:40:17 +01:00
8ce86f4d4c
added first version of dutch translation
2014-11-24 12:29:41 +01:00
36f0bdf93f
Merge branch 'develop' into 'master'
...
Develop
The MR will resolve #11
See merge request !31
2014-11-20 03:53:18 +01:00
5cf26ca23a
updated version to next release
2014-11-20 03:51:39 +01:00
18319d15e6
Merge branch 'feature/language-spanish' into 'develop'
...
Feature/language spanish
Merge the spanish feature into develop
See merge request !30
2014-11-20 03:50:19 +01:00
4c6567cc0f
updated version and manifest.appcache
2014-11-20 03:42:22 +01:00
72de912636
added spanish translation
2014-11-20 03:41:30 +01:00
0e137ec0b4
Merge branch 'develop'
2014-10-22 00:01:32 +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
3afc388856
Merge branch 'develop' into 'master'
...
Develop
See merge request !26
2014-09-03 15:24:52 +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
