git.ucc.asn.au
/
matches
/
MCTX3420.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge pull request #83 from jtanx/master
[matches/MCTX3420.git]
/
testing
/
MCTXWeb
/
2013-11-03
Jeremy Tan
Merge pull request #83 from jtanx/master
tree
|
commitdiff
2013-11-03
Jeremy Tan
Merge branch 'master' of https://github.com/jtanx/MCTX3420
tree
|
commitdiff
2013-11-03
Jeremy Tan
Make usercake work on marbles
tree
|
commitdiff
2013-11-01
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
tree
|
commitdiff
2013-11-01
Sam Moore
Merge pull request #82 from jtanx/master
tree
|
commitdiff
2013-10-31
Jeremy Tan
Merge branch 'master' of https://github.com/jtanx/MCTX3420
tree
|
commitdiff
2013-10-31
Jeremy Tan
Attempt to get image streaming page back from the dead...
tree
|
commitdiff
2013-10-31
Jeremy Tan
Some fixes
tree
|
commitdiff
2013-10-31
Jeremy Tan
Some fixes
tree
|
commitdiff
2013-10-29
Jeremy Tan
switch to fixed passwords (based on month/year)
tree
|
commitdiff
2013-10-28
Callum
Merge remote-tracking branch 'upstream/master' into...
tree
|
commitdiff
2013-10-28
Jeremy Tan
Add in change password
tree
|
commitdiff
2013-10-28
Jeremy Tan
use post for login. how did this get lost?
tree
|
commitdiff
2013-10-28
Jeremy Tan
Merge branch 'users'
tree
|
commitdiff
2013-10-28
Jeremy Tan
Fix link on login page
tree
|
commitdiff
2013-10-28
Jeremy Tan
remove own static stuff. use what's in place
tree
|
commitdiff
2013-10-28
Jeremy Tan
remove old stuff
tree
|
commitdiff
2013-10-28
Jeremy Tan
Nicen the rego form and add back the change password...
tree
|
commitdiff
2013-10-28
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420 into...
tree
|
commitdiff
2013-10-27
Jeremy Tan
segment the admin gui
tree
|
commitdiff
2013-10-26
Jeremy Tan
Add links to the relevant help page for SBD
tree
|
commitdiff
2013-10-26
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-26
Jeremy Tan
Update the block diagram
tree
|
commitdiff
2013-10-26
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-25
Sam Moore
Begin modifying UserCake
tree
|
commitdiff
2013-10-25
Sam Moore
Modify FastCGI server to use MySQL for auth
tree
|
commitdiff
2013-10-25
Sam Moore
Add UserCake
tree
|
commitdiff
2013-10-24
Jeremy Tan
Merge pull request #65 from jtanx/master
tree
|
commitdiff
2013-10-24
Jeremy Tan
fix some gui stuff
tree
|
commitdiff
2013-10-24
Jeremy Tan
Only use POST for login, and only if the GET string...
tree
|
commitdiff
2013-10-24
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-24
Sam Moore
Merge pull request #64 from justinjessada/master
tree
|
commitdiff
2013-10-23
Justin Kruger
Modified data page and added some report stuff
tree
|
commitdiff
2013-10-23
Jeremy Tan
Fix button disable bug
tree
|
commitdiff
2013-10-23
Jeremy Tan
Add in live values data page + minor gui fixes
tree
|
commitdiff
2013-10-23
Jeremy Tan
temp
tree
|
commitdiff
2013-10-23
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-23
Jeremy Tan
stuff
tree
|
commitdiff
2013-10-22
Jeremy Tan
Experiment with unblurring the captured image
tree
|
commitdiff
2013-10-22
Jeremy Tan
Add legend + save image works better
tree
|
commitdiff
2013-10-22
Jeremy Tan
Add samplerate control to control page
tree
|
commitdiff
2013-10-21
Sam Moore
Fix everything
tree
|
commitdiff
2013-10-21
Jeremy Tan
Merge branch 'master' into users
tree
|
commitdiff
2013-10-20
Sam Moore
Begin modifying UserCake
tree
|
commitdiff
2013-10-20
Sam Moore
Modify FastCGI server to use MySQL for auth
tree
|
commitdiff
2013-10-20
Callum
Merge remote-tracking branch 'upstream/master'
tree
|
commitdiff
2013-10-20
Sam Moore
Add UserCake
tree
|
commitdiff
2013-10-19
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
tree
|
commitdiff
2013-10-19
Jeremy Tan
Merge pull request #59 from jtanx/master
tree
|
commitdiff
2013-10-19
Jeremy Tan
Somewhat done control page
tree
|
commitdiff
2013-10-19
Jeremy Tan
Fix another graph bug + some more work on control page
tree
|
commitdiff
2013-10-19
Jeremy Tan
fix fix fix
tree
|
commitdiff
2013-10-19
Jeremy Tan
Fix brackets
tree
|
commitdiff
2013-10-19
Jeremy Tan
Fix two bugs in mctx.gui.js ++
tree
|
commitdiff
2013-10-19
Jeremy Tan
Get most of the stuff down for controls
tree
|
commitdiff
2013-10-18
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-18
Jeremy Tan
Sort of make a start on control page
tree
|
commitdiff
2013-10-17
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-14
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-14
Jeremy Tan
add crappy download link (not really)
tree
|
commitdiff
2013-10-14
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
tree
|
commitdiff
2013-10-14
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-14
Jeremy Tan
fix some crap
tree
|
commitdiff
2013-10-13
Jeremy Tan
Fix id bounds check for actuator + update graph code
tree
|
commitdiff
2013-10-13
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-13
Jeremy Tan
Rename help/data file + fix the sidebar width
tree
|
commitdiff
2013-10-13
Callum
Merge remote-tracking branch 'upstream/master'
tree
|
commitdiff
2013-10-12
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
tree
|
commitdiff
2013-10-12
Sam Moore
Add dedicated page for graphing stuff
tree
|
commitdiff
2013-10-12
Jeremy Tan
Minor formatting changes to justin's webpages.
tree
|
commitdiff
2013-10-12
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-12
Jeremy Tan
Merge pull request #57 from justinjessada/master
tree
|
commitdiff
2013-10-12
Justin Kruger
Formatting changes
tree
|
commitdiff
2013-10-12
Justin Kruger
Merge remote-tracking branch 'upstream/master'
tree
|
commitdiff
2013-10-12
Justin Kruger
Added data download page and help page (plus test files)
tree
|
commitdiff
2013-10-09
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-09
Sam Moore
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-09
Sam Moore
Add flot plot to styles
tree
|
commitdiff
2013-10-07
Jeremy Tan
Merge pull request #56 from jtanx/master
tree
|
commitdiff
2013-10-07
Jeremy Tan
re-enable strain graph on control page
tree
|
commitdiff
2013-10-07
Jeremy Tan
change sbd + header
tree
|
commitdiff
2013-10-06
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-06
Jeremy Tan
Add navigation menu
tree
|
commitdiff
2013-10-06
Jeremy Tan
Merge pull request #55 from jtanx/master
tree
|
commitdiff
2013-10-06
Jeremy Tan
Update gui. Add modified version of Justin's system...
tree
|
commitdiff
2013-10-06
Jeremy Tan
Merge pull request #53 from jtanx/master
tree
|
commitdiff
2013-10-06
Jeremy Tan
Bugfix for pin code and remove unused luts
tree
|
commitdiff
2013-10-05
Jeremy Tan
Prevent multiple additions of the same pin type
tree
|
commitdiff
2013-10-05
Jeremy Tan
Update gui
tree
|
commitdiff
2013-10-04
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
2013-10-04
Jeremy Tan
Add user friendly names (right now just usernames)
tree
|
commitdiff
2013-10-04
Jeremy Tan
Merge pull request #52 from jtanx/master
tree
|
commitdiff
2013-10-03
Jeremy Tan
Integrate gui login with server code
tree
|
commitdiff
2013-10-03
Jeremy Tan
Auto-redirect if logged in (at login page). Auto-redire...
tree
|
commitdiff
2013-10-03
Jeremy Tan
Add logout functionality
tree
|
commitdiff
2013-10-03
Jeremy Tan
Add js behind login form
tree
|
commitdiff
2013-10-03
Jeremy Tan
Restyle login page
tree
|
commitdiff
2013-10-03
Sam Moore
Merge pull request #49 from RowanHeinrich/patch-5
tree
|
commitdiff
2013-10-03
Sam Moore
Merge pull request #50 from RowanHeinrich/patch-6
tree
|
commitdiff
2013-10-03
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
tree
|
commitdiff
next
UCC
git Repository :: git.ucc.asn.au