Merge remote-tracking branch 'upstream/master'
[matches/MCTX3420.git] / testing / MCTXWeb / public_html / static /
2013-10-20 CallumMerge remote-tracking branch 'upstream/master'
2013-10-19 Sam MooreMerge branch 'master' of github:szmoore/MCTX3420
2013-10-19 Jeremy TanMerge pull request #59 from jtanx/master
2013-10-19 Jeremy TanSomewhat done control page
2013-10-19 Jeremy TanFix another graph bug + some more work on control page
2013-10-19 Jeremy TanFix two bugs in mctx.gui.js ++
2013-10-19 Jeremy TanGet most of the stuff down for controls
2013-10-18 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-18 Jeremy TanSort of make a start on control page
2013-10-17 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-14 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-14 Jeremy Tanadd crappy download link (not really)
2013-10-14 Sam MooreMerge branch 'master' of github:szmoore/MCTX3420
2013-10-14 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-14 Jeremy Tanfix some crap
2013-10-13 Jeremy TanFix id bounds check for actuator + update graph code
2013-10-13 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-13 Jeremy TanRename help/data file + fix the sidebar width
2013-10-13 CallumMerge remote-tracking branch 'upstream/master'
2013-10-12 Sam MooreMerge branch 'master' of github:szmoore/MCTX3420
2013-10-12 Sam MooreAdd dedicated page for graphing stuff
2013-10-12 Jeremy TanMinor formatting changes to justin's webpages.
2013-10-12 Justin KrugerMerge remote-tracking branch 'upstream/master'
2013-10-09 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-09 Sam MooreMerge branch 'master' of https://github.com/szmoore...
2013-10-09 Sam MooreAdd flot plot to styles
2013-10-07 Jeremy TanMerge pull request #56 from jtanx/master
2013-10-07 Jeremy Tanre-enable strain graph on control page
2013-10-07 Jeremy Tanchange sbd + header
2013-10-06 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-06 Jeremy TanAdd navigation menu
2013-10-06 Jeremy TanMerge pull request #55 from jtanx/master
2013-10-06 Jeremy TanUpdate gui. Add modified version of Justin's system...
2013-10-06 Jeremy TanMerge pull request #53 from jtanx/master
2013-10-06 Jeremy TanBugfix for pin code and remove unused luts
2013-10-05 Jeremy TanPrevent multiple additions of the same pin type
2013-10-05 Jeremy TanUpdate gui
2013-10-04 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-10-04 Jeremy TanAdd user friendly names (right now just usernames)
2013-10-04 Jeremy TanMerge pull request #52 from jtanx/master
2013-10-03 Jeremy TanIntegrate gui login with server code
2013-10-03 Jeremy TanAuto-redirect if logged in (at login page). Auto-redire...
2013-10-03 Jeremy TanAdd logout functionality
2013-10-03 Jeremy TanAdd js behind login form
2013-10-03 Jeremy TanRestyle login page
2013-09-30 Sam MooreMerge branch 'master' of https://github.com/szmoore...
2013-09-30 Jeremy TanMerge pull request #48 from jtanx/master
2013-09-30 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-09-30 Jeremy TanEnsure error log tries to update even on failure
2013-09-29 Jeremy Tanfix buttons
2013-09-29 Jeremy TanMerge pull request #47 from jtanx/master
2013-09-29 Jeremy TanPin test page cleanup
2013-09-29 Jeremy TanMerge pull request #46 from jtanx/master
2013-09-29 Sam MooreMerge branch 'master' of github:szmoore/MCTX3420
2013-09-29 Sam MooreMerge branch 'master' of https://github.com/firefields...
2013-09-29 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-09-29 Jeremy TanMerge Rowan's html code + slightly update styles
2013-09-29 Jeremy TanUpdate pintest + fix css
2013-09-29 Sam MooreMerge pull request #45 from RowanHeinrich/patch-3
2013-09-29 Sam MooreMerge pull request #45 from RowanHeinrich/patch-3
2013-09-29 Sam MooreMerge branch 'master' of https://github.com/firefields...
2013-09-29 RowanHeinrichUpdate style.css
2013-09-29 RowanHeinrichUpdate style.css
2013-09-29 Jeremy TanMerge pull request #44 from jtanx/master
2013-09-29 Jeremy Tanupdate gui
2013-09-23 Sam MooreMerge branch 'master' of https://github.com/szmoore...
2013-09-23 Sam MooreMerge branch 'master' of https://github.com/szmoore...
2013-09-23 Jeremy TanMerge pull request #41 from jtanx/master
2013-09-23 Jeremy TanMerge pull request #41 from jtanx/master
2013-09-23 Jeremy TanUpdate gui
2013-09-23 Jeremy TanUpdate gui
2013-09-22 Jeremy TanWork on test gui
2013-09-22 Jeremy TanWork on test gui
2013-09-22 Jeremy TanIE8 fix (class is keyword and IE8 is not happy)
2013-09-22 Jeremy TanIE8 fix (class is keyword and IE8 is not happy)
2013-09-22 Jeremy TanAdd graphs. Currently eats 100% of my cpu...
2013-09-22 Jeremy TanAdd graphs. Currently eats 100% of my cpu...
2013-09-22 Sam MooreMerge branch 'master' of github:/szmoore/MCTX3420
2013-09-22 Sam MooreMerge branch 'master' of github:/szmoore/MCTX3420
2013-09-22 Jeremy TanMerge pull request #40 from jtanx/master
2013-09-22 Jeremy TanMerge pull request #40 from jtanx/master
2013-09-22 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-09-22 Jeremy TanMerge branch 'master' of https://github.com/szmoore...
2013-09-22 Jeremy TanUpdate test gui stuff
2013-09-22 Jeremy TanUpdate test gui stuff
2013-09-19 Jeremy TanAdd test gui
2013-09-19 Jeremy TanAdd test gui

UCC git Repository :: git.ucc.asn.au