manuel
/
uhr
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity
440 Commits 11 Branches 32 Tags 7.4 MiB
Commit Graph

440 Commits

Author SHA1 Message Date
Manuel Friedli 3e8252fa13 fixed a typo 2014-06-26 14:07:31 +02:00
Manuel Friedli eff9700864 first working version with some bugfixes! refactoring ensues ... 2014-06-26 13:46:10 +02:00
Manuel Friedli 9a1160f66e deletes _TEST-file, working with the _new-file from now on. 2014-06-26 10:43:15 +02:00
Manuel Friedli 10c07a05cf using a helper object works, as object properties cannot be accesses 
before the object has been initialized.
 2014-06-26 08:08:06 +02:00
Manuel Friedli 0d90b3dd76 moved testing stuff to ownfiles. 2014-06-26 08:00:15 +02:00
Manuel Friedli b4f2a466b7 some debug output 2014-06-25 13:13:11 +02:00
Manuel Friedli d7c461f39a added new layout and first handling of it in the parser 2014-06-25 13:13:10 +02:00
Manuel Friedli 78dcd7c66f Merge branch 'develop' into 'master' 
Develop
 2014-06-20 02:19:49 +02:00
Manuel Friedli dc098233fe changed the things according to the comments in the merge request 2014-06-20 01:57:06 +02:00
Manuel Friedli 8e0aaacbd8 updated manifest.appcache in preparation of release 5.0 2014-06-20 01:50:34 +02:00
Manuel Friedli ad50e9237a Merge branch 'develop' into feature/ios-app 
Conflicts:
	index.html
 2014-06-20 01:43:41 +02:00
Manuel Friedli 5b8a3bfd22 now trying with HTML meta tags. 2014-06-20 01:37:54 +02:00
Manuel Friedli dc9768ed2b updated manifest.appcache 2014-06-20 01:33:21 +02:00
Manuel Friedli cfb85c26a0 trying different sizes of splash screens 2014-06-20 01:31:23 +02:00
Manuel Friedli 6102097b50 deleted old splash screen 2014-06-20 01:21:04 +02:00
Manuel Friedli 229bf3ef8e added new splash screens 2014-06-20 01:18:50 +02:00
Manuel Friedli ad809a6a6e new touch icon 2014-06-20 00:55:52 +02:00
Manuel Friedli 6b24cc3eb3 mark the icon as precomposed 2014-06-20 00:32:21 +02:00
Manuel Friedli 1b06330329 NOW it's good: initial-scale=1 2014-06-20 00:27:21 +02:00
Manuel Friedli c39ea30e9b perhaps it gets more readable on an iOS device like this 2014-06-20 00:25:58 +02:00
Manuel Friedli 50e4006a84 Merge branch 'bugfix/typos-layout' into 'develop' 
Bugfix/Typos Layout
 2014-06-20 00:16:53 +02:00
Manuel Friedli 8b5b343e35 corrected some typos and increased font-size on the info page 
(cherry picked from commit e702aa6869ee9eed64271b71f3a48d2c4206f12f)
 2014-06-20 00:14:20 +02:00
Manuel Friedli 2c5ac65bad updated manifest.appcache 2014-06-19 23:55:21 +02:00
Manuel Friedli 90e6d6d0f3 fixed various small things 2014-06-19 23:09:58 +02:00
Manuel Friedli aeeb197104 fixed HTML structure (un-closed p-tag) 
removed link around clock
 2014-05-15 15:20:48 +02:00
Manuel Friedli b4d67be48c added splash screen. doesn't show up yet, though. 2014-05-09 15:21:45 +02:00
Manuel Friedli 23411bc59b added splash screen for ios 2014-05-09 15:07:30 +02:00
Manuel Friedli a9f5667954 changed a-umlaut to REAL (utf-8) a-umlaut 2014-05-09 14:45:06 +02:00
Manuel Friedli c629833812 added home-icon for iOS 2014-05-09 14:42:26 +02:00
Manuel Friedli 8f9adbe567 added some neat tags for ios :) 2014-05-08 13:54:24 +02:00
Manuel Friedli e640fe4362 Merge branch 'develop' 2014-04-22 21:03:08 +02:00
Manuel Friedli 18460cfbbe updated manifest.appcache 2014-04-22 21:02:42 +02:00
Manuel Friedli 7f86fa1a4a Merge branch 'develop' into 'master' 
Develop
 2014-04-22 20:52:16 +02:00
Manuel Friedli 76cefba0fb Merge branch 'feature/info' into 'develop' 
Feature/Info
 2014-04-22 20:50:36 +02:00
Manuel Friedli 013c6c48c4 turned the clock in the info page into a link to root 2014-04-22 20:49:26 +02:00
Manuel Friedli 27d4331491 Merge branch 'develop' into 'master' 
Develop
 2014-04-22 20:39:03 +02:00
Manuel Friedli cec282ed3e added link to fritteli.ch 2014-04-22 20:11:47 +02:00
Manuel Friedli 86c819534a corrected two typos 2014-04-22 20:11:05 +02:00
Manuel Friedli ec255aec1c fixed ol-numbering (nested style) 2014-03-05 23:09:50 +01:00
Manuel Friedli 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
Manuel Friedli 58f63c569a more info, better structured 2014-03-05 22:59:02 +01:00
Manuel Friedli 2703d21168 added dependency info 2014-03-05 22:09:39 +01:00
Manuel Friedli a9bd12fec0 added info-page 2014-03-05 22:09:39 +01:00
Manuel Friedli 7fcb77f60f Merge branch 'feature/update-libs' into 'develop' 
Feature/Update Libs
 2014-03-05 22:07:36 +01:00
Manuel Friedli d5469d95d2 updated jquery to 2.1.0 and jquery-ui to 1.10.4 2014-03-05 22:05:02 +01:00
Manuel Friedli 3233bcd017 added dependency info 2014-02-28 23:21:51 +01:00
Manuel Friedli 0074c393b6 added info-page 2014-02-28 22:52:38 +01:00
Manuel Friedli 35af5ebb73 Merge branch 'develop' of /var/lib/git/repositories/manuel/uhr 2014-01-20 16:02:03 +01:00
Manuel Friedli 9616ccac1c Merge branch 'feature/switchesconfig' of /var/lib/git/repositories/manuel/uhr into develop 2014-01-20 15:53:36 +01:00
Manuel Friedli a31fb1ead1 fixed indentation level 2014-01-20 15:52:49 +01:00