|
|
7f86fa1a4a
|
Merge branch 'develop' into 'master'
Develop
|
2014-04-22 20:52:16 +02:00 |
|
|
|
76cefba0fb
|
Merge branch 'feature/info' into 'develop'
Feature/Info
|
2014-04-22 20:50:36 +02:00 |
|
|
|
013c6c48c4
|
turned the clock in the info page into a link to root
|
2014-04-22 20:49:26 +02:00 |
|
|
|
27d4331491
|
Merge branch 'develop' into 'master'
Develop
|
2014-04-22 20:39:03 +02:00 |
|
|
|
cec282ed3e
|
added link to fritteli.ch
|
2014-04-22 20:11:47 +02:00 |
|
|
|
86c819534a
|
corrected two typos
|
2014-04-22 20:11:05 +02:00 |
|
|
|
ec255aec1c
|
fixed ol-numbering (nested style)
|
2014-03-05 23:09:50 +01:00 |
|
|
|
5586771b0e
|
Merge branch 'feature/info' of git.friedli.info:manuel/uhr into feature/info
Conflicts:
info/index.html
|
2014-03-05 23:01:09 +01:00 |
|
|
|
58f63c569a
|
more info, better structured
|
2014-03-05 22:59:02 +01:00 |
|
|
|
2703d21168
|
added dependency info
|
2014-03-05 22:09:39 +01:00 |
|
|
|
a9bd12fec0
|
added info-page
|
2014-03-05 22:09:39 +01:00 |
|
|
|
7fcb77f60f
|
Merge branch 'feature/update-libs' into 'develop'
Feature/Update Libs
|
2014-03-05 22:07:36 +01:00 |
|
|
|
d5469d95d2
|
updated jquery to 2.1.0 and jquery-ui to 1.10.4
|
2014-03-05 22:05:02 +01:00 |
|
|
|
3233bcd017
|
added dependency info
|
2014-02-28 23:21:51 +01:00 |
|
|
|
0074c393b6
|
added info-page
|
2014-02-28 22:52:38 +01:00 |
|
|
|
35af5ebb73
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2014-01-20 16:02:03 +01:00 |
|
|
|
9616ccac1c
|
Merge branch 'feature/switchesconfig' of /var/lib/git/repositories/manuel/uhr into develop
|
2014-01-20 15:53:36 +01:00 |
|
|
|
a31fb1ead1
|
fixed indentation level
|
2014-01-20 15:52:49 +01:00 |
|
|
|
0412ea17fc
|
added functionality to hide controls
|
2014-01-20 15:47:13 +01:00 |
|
|
|
388e0108e7
|
Merge branch 'develop'
|
2014-01-13 11:11:44 +01:00 |
|
|
|
18c629f1e2
|
updated page title
|
2014-01-13 11:11:24 +01:00 |
|
|
|
9a4882dc25
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2014-01-11 23:49:29 +01:00 |
|
|
|
22deff86f7
|
Merge branch 'feature/jqueryplugin' of /var/lib/git/repositories/manuel/uhr into develop
|
2014-01-11 23:45:49 +01:00 |
|
|
|
8a413b17a0
|
corrected javascriptdoc
|
2014-01-11 23:33:17 +01:00 |
|
|
|
2f5cddbfa2
|
updated readme
|
2014-01-11 23:20:29 +01:00 |
|
|
|
8ce8167225
|
manifest aktualisiert
|
2014-01-11 23:17:18 +01:00 |
|
|
|
1204800def
|
updated readme
|
2014-01-11 23:16:59 +01:00 |
|
|
|
d51b00fece
|
go back to standard behavior for index.html: one simple Bärneruhr
|
2014-01-11 23:16:20 +01:00 |
|
|
|
831f1facd7
|
time() funktion implementiert; damit kann eine fixe zeit gesetzt werden. noch nicht ganz ausgereift.
|
2014-01-11 22:54:46 +01:00 |
|
|
|
9710663b1d
|
added favicon
|
2014-01-11 22:09:52 +01:00 |
|
|
|
492d2a983e
|
cleaned up the index.html and renamed jquery.cookie.js
|
2014-01-11 21:07:41 +01:00 |
|
|
|
0864a68f11
|
update d manifest
|
2014-01-11 21:00:47 +01:00 |
|
|
|
e995a2f224
|
jQuery-Plugin ist nun mit jQuery UI widget builder (oder wie das heisst) implementiert. viel schöner!!!
|
2014-01-11 20:56:21 +01:00 |
|
|
|
fc2c8ac38a
|
es funzt! nun muss ich aufräumen und das ganze noch RICHTIG machen.
|
2014-01-11 12:18:11 +01:00 |
|
|
|
9db6473085
|
tried to convert it, now it's a mess
|
2014-01-11 03:26:53 +01:00 |
|
|
|
34369f3f89
|
final markdown fixes (thanks to http://daringfireball.net/projects/markdown/dingus)
|
2014-01-09 22:58:01 +01:00 |
|
|
|
db8ca7e394
|
more fixes
|
2014-01-09 22:28:51 +01:00 |
|
|
|
6bed150c89
|
more fixes
|
2014-01-09 22:28:19 +01:00 |
|
|
|
76cfd4de8d
|
more fixes
|
2014-01-09 22:27:57 +01:00 |
|
|
|
77fd7aa805
|
more fixes
|
2014-01-09 22:25:35 +01:00 |
|
|
|
bb6a3cdc8e
|
markdown fixes
|
2014-01-09 22:22:43 +01:00 |
|
|
|
20c8c7d681
|
moved README to README.md, with some markdown
|
2014-01-09 22:19:08 +01:00 |
|
|
|
5b8d878dbf
|
Merge branch 'develop'
|
2013-12-17 21:53:05 +01:00 |
|
|
|
5cdadfc982
|
updated manifest
|
2013-12-17 21:52:55 +01:00 |
|
|
|
93b8a35840
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-12-17 21:51:20 +01:00 |
|
|
|
ebc82f4eff
|
improved default site and fixed JS error; need to tackle that again, though
|
2013-12-17 21:50:28 +01:00 |
|
|
|
495235db99
|
Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr
|
2013-12-09 20:38:09 +01:00 |
|
|
|
149073b668
|
updated manifest
|
2013-12-09 20:36:53 +01:00 |
|
|
|
7d548fb4f6
|
Merge branch 'feature/multiinclude' of /var/lib/git/repositories/manuel/uhr into develop
|
2013-12-09 20:36:13 +01:00 |
|
|
|
1ef8df63e3
|
try it differently
|
2013-12-09 20:32:45 +01:00 |
|
