|
|
bb60117dcf
|
erster schritt, layout-dropdown dynamisch zu laden
|
2013-11-27 18:37:38 +01:00 |
|
|
|
66283e3424
|
jede uhr hat eine eigene id
|
2013-11-27 18:16:42 +01:00 |
|
|
|
a28dcdf836
|
toggler erzeugen statt hardcoded
|
2013-11-27 18:13:37 +01:00 |
|
|
|
562855e8f1
|
set layout korrekt
|
2013-11-27 17:48:41 +01:00 |
|
|
|
714e86a53c
|
set cookie path and date
|
2013-11-27 17:45:28 +01:00 |
|
|
|
2fa23c2f07
|
layouts global registrieren, nicht pro uhr
|
2013-11-27 17:36:05 +01:00 |
|
|
|
1c06b7248a
|
leerzeile entfernt
|
2013-11-27 17:08:22 +01:00 |
|
|
|
8bce99c33a
|
css korrigiert, class statt id
|
2013-11-27 16:34:51 +01:00 |
|
|
|
300477cc3f
|
uhr erzeugt html-elemente selber
|
2013-11-27 16:20:47 +01:00 |
|
|
|
fe243507ec
|
mehr classes statt ids
|
2013-11-27 15:40:56 +01:00 |
|
|
|
5708fd52f5
|
Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhrmodul
|
2013-11-27 15:32:48 +01:00 |
|
|
|
2f2d5db317
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-11-27 15:31:11 +01:00 |
|
|
|
3cfbbecb2a
|
manifest aktualisiert
|
2013-11-27 15:30:47 +01:00 |
|
|
|
0d19efa4ee
|
Merge branch 'bugfix/engl' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-27 15:29:38 +01:00 |
|
|
|
c4d28055ae
|
stunde für englisch geflickt
|
2013-11-27 15:28:48 +01:00 |
|
|
|
5899a3a255
|
klassen statt IDs
|
2013-11-27 15:25:34 +01:00 |
|
|
|
df3eabe11e
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-11-27 11:39:49 +01:00 |
|
|
|
f338b47902
|
Merge branch 'feature/gpl3' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-27 11:39:30 +01:00 |
|
|
|
e583cf89ee
|
manifest aktualisiert
|
2013-11-27 11:13:15 +01:00 |
|
|
|
ddf22699a9
|
GPL3 hinzugefügt und Lizenztext überall eingefügt
|
2013-11-27 11:12:50 +01:00 |
|
|
|
1cf8924311
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-11-26 19:13:53 +01:00 |
|
|
|
7a40a82665
|
Manifest aktualisiert
|
2013-11-26 19:13:37 +01:00 |
|
|
|
70c55db699
|
Merge branch 'bugfix/dot-clear' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-26 19:12:24 +01:00 |
|
|
|
a51f83ec65
|
clear() geflickt
|
2013-11-26 19:09:47 +01:00 |
|
|
|
7a8783cf92
|
Merge branch 'develop'
|
2013-11-26 15:34:36 +01:00 |
|
|
|
d014295ef7
|
Merge branch 'master' into develop
|
2013-11-26 15:32:47 +01:00 |
|
|
|
6c00c5eba5
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-11-26 15:31:11 +01:00 |
|
|
|
9521ffd1e8
|
manifest aktualisiert
|
2013-11-26 15:29:59 +01:00 |
|
|
|
09f74441f2
|
Merge branch 'bugfix/dots' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-26 15:29:03 +01:00 |
|
|
|
d5ba90b4d6
|
punktanzeige geflickt
|
2013-11-26 15:27:57 +01:00 |
|
|
|
4594c6600e
|
Merge branch 'develop' of git.friedli.info:manuel/uhr
|
2013-11-26 13:41:55 +01:00 |
|
|
|
18e0762688
|
manifest aktualisisert
|
2013-11-26 13:41:31 +01:00 |
|
|
|
dc4236a841
|
Merge branch 'feature/uhr-object' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-26 13:39:44 +01:00 |
|
|
|
cca45e59e7
|
layoutswitscher und themeswitcher getauscht
|
2013-11-26 13:38:04 +01:00 |
|
|
|
a2b4fbe2e4
|
testdatei gelöscht
|
2013-11-26 13:35:56 +01:00 |
|
|
|
d7d03b5b51
|
Merge branch 'develop' of git.friedli.info:manuel/uhr into feature/uhr-object
Conflicts:
uhr-de.js
uhr-de_CH.js
uhr-en.js
|
2013-11-26 13:32:17 +01:00 |
|
|
|
6f14da392a
|
auf objekt umgestellt und aufgeräumt
|
2013-11-26 13:25:50 +01:00 |
|
|
|
d3daf58e2e
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-11-26 13:15:38 +01:00 |
|
|
|
1f3f5d33f7
|
manifest aktualisiert
|
2013-11-26 13:14:43 +01:00 |
|
|
|
0062ece799
|
Merge branch 'bugfix/deutsch-eins-uhr' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-26 13:12:57 +01:00 |
|
|
|
ce75dae1b0
|
überzählige datei gelöscht
|
2013-11-26 13:12:16 +01:00 |
|
|
|
980ed302d3
|
Bei deutsch keine "sharphour" als quickfix (ansonsten: "Es ist eins uhr", und das sieht doof aus)
|
2013-11-26 13:06:36 +01:00 |
|
|
|
7fc0793b70
|
checkbox-fix?
|
2013-11-26 12:56:52 +01:00 |
|
|
|
8ca4777a7c
|
verschiedene bugfixes und auf index.html umgestellt
|
2013-11-26 12:48:15 +01:00 |
|
|
|
d69c6ecfab
|
uhr-objekt erstellt und funktionalität gezügelt
|
2013-11-26 12:31:50 +01:00 |
|
|
|
0eb1edbccd
|
manifest aktualisiert, vielleicht hilft das bei cache-problemen.
|
2013-11-26 10:53:12 +01:00 |
|
|
|
48886ff958
|
hotfixes
|
2013-11-25 20:52:18 +01:00 |
|
|
|
14ba6ae90c
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-11-25 17:00:48 +01:00 |
|
|
|
aeb31358b3
|
manifest aktualisiert
|
2013-11-25 16:59:59 +01:00 |
|
|
|
558de1d49c
|
Merge branch 'feature/cookie' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-11-25 16:59:24 +01:00 |
|
