Commit graph

211 commits

Author SHA1 Message Date
Steffen Vogel
2350f62992 adapted to flot 2010-10-04 02:22:32 +02:00
Steffen Vogel
58df4816b6 added flot 2010-10-04 02:21:40 +02:00
Steffen Vogel
4039c6056b removed jqplot 2010-10-04 02:19:24 +02:00
Steffen Vogel
d11a96a34d restructured javascript code in more files 2010-10-03 21:51:02 +02:00
Steffen Vogel
56928bb916 i'm loving js (sry there's no better comment for this commit ;)
removed obsolete jstree
several smaller changes
2010-10-03 20:13:05 +02:00
Steffen Vogel
7fd2504e7c worked on frontend javascript code (jqPlot drawing is buggy & needs some research) 2010-10-02 18:12:55 +02:00
Steffen Vogel
fd4d4cfcc0 debugging-night part 1 2010-10-01 23:06:40 +02:00
Steffen Vogel
95fb4f0b71 its going on.. (unfortunatly with some smaller bugs) 2010-10-01 11:23:31 +02:00
Steffen Vogel
261fa6f768 added treeTable for channels
restructed ad bit
2010-09-29 21:59:49 +02:00
Steffen Vogel
e6bf6952d9 frontend is processing.. 2010-09-28 18:17:45 +02:00
Steffen Vogel
abad63d9fc fixed path for cookie 2010-09-28 18:17:21 +02:00
Steffen Vogel
70a2c0eeaf beautified frontend 2010-09-28 16:25:09 +02:00
Steffen Vogel
1e97616a37 reworked data format and aggregation 2010-09-28 15:46:30 +02:00
Steffen Vogel
3702d84d7c simplified frontend again, adapted to new format 2010-09-28 15:44:28 +02:00
Steffen Vogel
f8e4e69fb6 updated bash script to new backend api 2010-09-27 21:53:09 +02:00
Steffen Vogel
29df41a3f5 fixed undefined index for sensor calculations 2010-09-27 15:13:43 +02:00
Steffen Vogel
4c499f7424 simplified frontend 2010-09-27 01:33:49 +02:00
Steffen Vogel
105b547cbe Merge branch 'master' of github.com:volkszaehler/volkszaehler.org
Conflicts:
	frontend/index.html
	frontend/javascript/smartmeter.js
2010-09-27 00:36:48 +02:00
Steffen Vogel
aad462c297 seperated code from layout and structure 2010-09-27 00:26:35 +02:00
Steffen Vogel
39414ab9e2 next commit for the controller webinterface 2010-09-26 19:57:37 +02:00
Steffen Vogel
78fa8c2129 small fixes 2010-09-26 14:05:41 +02:00
Steffen Vogel
ed9f71e519 fixed definitions and added translations 2010-09-26 14:00:15 +02:00
Justin Otherguy
6ea28198e6 relocated some js functions from frontend/index.html to frontend/javascript/smartmeter.js 2010-09-25 18:18:08 +02:00
Justin Otherguy
ab519bf667 removed unused function getEmptyGroupArray 2010-09-25 18:15:39 +02:00
Justin Otherguy
50b8e04d9d removed unused function checkRegexp 2010-09-25 17:58:26 +02:00
Justin Otherguy
49755d1113 removed unused function generateAxisTicks 2010-09-25 17:57:10 +02:00
Steffen Vogel
d63f919322 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org 2010-09-25 01:37:45 +02:00
Steffen Vogel
f0ac7ce068 added darft of controller webinterface 2010-09-25 01:37:04 +02:00
Steffen Vogel
b2c16229f7 moved json definitions to capabilities controller 2010-09-25 00:42:07 +02:00
Steffen Vogel
1a2977e345 cosmetics 2010-09-24 17:20:38 +02:00
Steffen Vogel
4ec446240c readded mysql schema
reworked README
2010-09-24 17:18:44 +02:00
Justin Otherguy
8e36c1d976 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org 2010-09-24 02:31:03 +02:00
Justin Otherguy
cf79903a26 some minor changes 2010-09-24 02:30:31 +02:00
Justin Otherguy
4e47e733e3 adopted fe to new json format (fettes merci an flo!!!) 2010-09-23 21:28:02 +02:00
Justin Otherguy
f3c267e0d5 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org 2010-09-20 08:50:24 +02:00
Steffen Vogel
50cbab27eb updated proxies 2010-09-23 00:45:14 +02:00
Steffen Vogel
98555e3188 fixed swapped variables 2010-09-22 23:52:36 +02:00
Steffen Vogel
ca8a7ae753 added validation 2010-09-22 23:32:45 +02:00
Steffen Vogel
4195e8b993 refactoring und validation of identifiers 2010-09-22 23:18:08 +02:00
Steffen Vogel
c4ed1acef8 added time parsing of flexible formats 2010-09-22 23:15:27 +02:00
Steffen Vogel
8357ede9f2 simplified the group nesting a lot 2010-09-22 20:54:51 +02:00
Steffen Vogel
9ac98d9a08 fixed typo before <?php 2010-09-22 20:53:38 +02:00
Steffen Vogel
af51e7855d moved iterators to interpreters 2010-09-22 20:52:59 +02:00
Steffen Vogel
1b4d7b3661 Merge branch 'master' of github.com:volkszaehler/volkszaehler.org 2010-09-22 02:33:13 +02:00
Steffen Vogel
126f1234e8 simplified url schema (only one context) 2010-09-22 02:32:17 +02:00
Steffen Vogel
1472d4bcc7 cosmetic changes 2010-09-22 02:32:03 +02:00
Steffen Vogel
f697228f97 moved InterpreterInterface to own file
updated several interpreters
2010-09-22 02:29:15 +02:00
Steffen Vogel
208f8ad12b adapted controllers to new mvc implementation
added some operations
2010-09-22 02:28:09 +02:00
Steffen Vogel
c3cc6987ca adapted view system to new mvc implementation 2010-09-22 02:27:43 +02:00
Steffen Vogel
d1be7dc3fc updated prng 2010-09-22 02:27:15 +02:00