git.ucc.asn.au
/
matches
/
MCTX3420.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Automatic commit of irc logs
[matches/MCTX3420.git]
/ server
2013-11-03
Sam Moore
Merge pull request #85 from Callum-/dilatometer
commit
|
commitdiff
2013-11-03
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-11-03
Jeremy Tan
Hmm, probably don't want the comment like that!
commit
|
commitdiff
2013-11-03
Jeremy Tan
Merge pull request #84 from jtanx/master
commit
|
commitdiff
2013-11-03
Jeremy Tan
Fix brief string
commit
|
commitdiff
2013-11-03
Jeremy Tan
Update comments for Doxygen. Move old, unused files...
commit
|
commitdiff
2013-11-03
Jeremy Tan
Merge pull request #83 from jtanx/master
commit
|
commitdiff
2013-11-03
Jeremy Tan
Merge branch 'master' of https://github.com/jtanx/MCTX3420
commit
|
commitdiff
2013-11-03
Jeremy Tan
Make usercake work on marbles
commit
|
commitdiff
2013-11-03
Jeremy Tan
Final commit from marbles
commit
|
commitdiff
2013-11-01
Jeremy Tan
Final commit from marbles
commit
|
commitdiff
2013-11-01
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
commit
|
commitdiff
2013-11-01
Sam Moore
Merge pull request #82 from jtanx/master
commit
|
commitdiff
2013-10-31
Jeremy Tan
Merge branch 'master' of https://github.com/jtanx/MCTX3420
commit
|
commitdiff
2013-10-31
Jeremy Tan
Some fixes
commit
|
commitdiff
2013-10-31
Callum
Update dilatometer.c
commit
|
commitdiff
2013-10-31
Jeremy Tan
Some fixes
commit
|
commitdiff
2013-10-30
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-30
Callum
Update dilatometer.h
commit
|
commitdiff
2013-10-30
Sam Moore
Add usleep to strain.c just in case...
commit
|
commitdiff
2013-10-30
Sam Moore
Fix dilatometer, other misc stuff
commit
|
commitdiff
2013-10-30
Jeremy Tan
add fclose to shadow login
commit
|
commitdiff
2013-10-29
Callum
Update dilatometer.c
commit
|
commitdiff
2013-10-29
Callum
Merge pull request #72 from Callum-/dilatometer
commit
|
commitdiff
2013-10-29
Callum
Added a dilatometer "sensor"
commit
|
commitdiff
2013-10-29
Callum
Update dilatometer.h
commit
|
commitdiff
2013-10-29
Callum
Merge pull request #71 from Callum-/dilatometer
commit
|
commitdiff
2013-10-29
Callum
changed some variables to defines
commit
|
commitdiff
2013-10-29
Callum
Merge pull request #70 from Callum-/dilatometer
commit
|
commitdiff
2013-10-29
Callum
modified image.c
commit
|
commitdiff
2013-10-29
Callum
Changed capture initilisation
commit
|
commitdiff
2013-10-29
Callum
Merge pull request #69 from Callum-/dilatometer
commit
|
commitdiff
2013-10-29
Callum
Done a bunch of changes to image handling
commit
|
commitdiff
2013-10-29
Sam Moore
Add dilatometer as sensor
commit
|
commitdiff
2013-10-29
Sam Moore
Add dilatometer as sensor
commit
|
commitdiff
2013-10-28
Callum
Merge pull request #68 from Callum-/dilatometer
commit
|
commitdiff
2013-10-28
Callum
Wrote code to implement camera
commit
|
commitdiff
2013-10-28
Callum
Merge remote-tracking branch 'upstream/master' into...
commit
|
commitdiff
2013-10-28
Callum
comment
commit
|
commitdiff
2013-10-28
Jeremy Tan
Fix some minor compiler issues
commit
|
commitdiff
2013-10-28
Callum
edited dilatometer
commit
|
commitdiff
2013-10-28
Jeremy Tan
Merge branch 'users'
commit
|
commitdiff
2013-10-28
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420 into...
commit
|
commitdiff
2013-10-27
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-27
Jeremy Tan
Disallow control codes in urldecode
commit
|
commitdiff
2013-10-26
Callum
Merge pull request #66 from Callum-/master
commit
|
commitdiff
2013-10-26
Callum
renamed functions to microscope, redid Read fnctn
commit
|
commitdiff
2013-10-26
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-25
Jeremy Tan
Merge branch 'users' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-25
Jeremy Tan
modified version to get control key
commit
|
commitdiff
2013-10-25
Jeremy Tan
manual merge of fastcgi.c
commit
|
commitdiff
2013-10-25
Sam Moore
Begin modifying UserCake
commit
|
commitdiff
2013-10-25
Sam Moore
Modify FastCGI server to use MySQL for auth
commit
|
commitdiff
2013-10-24
Jeremy Tan
Merge pull request #65 from jtanx/master
commit
|
commitdiff
2013-10-24
Jeremy Tan
Only use POST for login, and only if the GET string...
commit
|
commitdiff
2013-10-24
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-24
Jeremy Tan
Add POST handling and URLDecode POST/GET request data...
commit
|
commitdiff
2013-10-23
Jeremy Tan
Add in live values data page + minor gui fixes
commit
|
commitdiff
2013-10-23
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-23
Jeremy Tan
stuff
commit
|
commitdiff
2013-10-23
Jeremy Tan
ypo typo
commit
|
commitdiff
2013-10-23
Jeremy Tan
fixes
commit
|
commitdiff
2013-10-22
Jeremy Tan
mf
commit
|
commitdiff
2013-10-21
Sam Moore
Fix everything
commit
|
commitdiff
2013-10-21
Jeremy Tan
Merge pull request #61 from jtanx/master
commit
|
commitdiff
2013-10-21
Jeremy Tan
modified version to get control key
commit
|
commitdiff
2013-10-21
Jeremy Tan
manual merge of fastcgi.c
commit
|
commitdiff
2013-10-21
Jeremy Tan
Merge branch 'master' into users
commit
|
commitdiff
2013-10-20
Jeremy Tan
Switch to named cookies (mctxkey)
commit
|
commitdiff
2013-10-20
Sam Moore
Begin modifying UserCake
commit
|
commitdiff
2013-10-20
Callum
Merge pull request #60 from Callum-/master
commit
|
commitdiff
2013-10-20
Callum
added canny edge
commit
|
commitdiff
2013-10-20
Sam Moore
Modify FastCGI server to use MySQL for auth
commit
|
commitdiff
2013-10-20
Callum
Merge remote-tracking branch 'upstream/master'
commit
|
commitdiff
2013-10-19
Sam Moore
Fix sensor header
commit
|
commitdiff
2013-10-19
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
commit
|
commitdiff
2013-10-19
Sam Moore
Add define for compiling under RTLinux
commit
|
commitdiff
2013-10-19
Jeremy Tan
Merge pull request #59 from jtanx/master
commit
|
commitdiff
2013-10-19
Jeremy Tan
add back check
commit
|
commitdiff
2013-10-19
Jeremy Tan
Use experiment folders instead of chdir
commit
|
commitdiff
2013-10-19
Sam Moore
Increase precision of timestamps
commit
|
commitdiff
2013-10-19
Sam Moore
Change from usleep and gettimeofday to clock_nanosleep...
commit
|
commitdiff
2013-10-17
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-17
Debian User
Allow only one camera on at a time.
commit
|
commitdiff
2013-10-17
Debian User
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-17
Debian User
Modify image capture routine
commit
|
commitdiff
2013-10-14
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-14
Sam Moore
Work on user based control
commit
|
commitdiff
2013-10-14
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
commit
|
commitdiff
2013-10-14
Sam Moore
Tweak Actuators/Sensors code
commit
|
commitdiff
2013-10-14
Jeremy Tan
Merge branch 'master' of https://github.com/szmoore...
commit
|
commitdiff
2013-10-14
Sam Moore
Add pressure sensors
commit
|
commitdiff
2013-10-14
Callum
Merge remote-tracking branch 'upstream/master'
commit
|
commitdiff
2013-10-14
Callum
slight changes
commit
|
commitdiff
2013-10-13
Jeremy Tan
Fix id bounds check for actuator + update graph code
commit
|
commitdiff
2013-10-13
Callum
Merge pull request #58 from Callum-/master
commit
|
commitdiff
2013-10-13
Callum
Finished test function
commit
|
commitdiff
2013-10-13
Callum
Merge remote-tracking branch 'upstream/master'
commit
|
commitdiff
2013-10-12
Sam Moore
Merge branch 'master' of github:szmoore/MCTX3420
commit
|
commitdiff
2013-10-12
Jeremy Tan
Remove old lock/release cases from control.c + hopefull...
commit
|
commitdiff
next
UCC
git Repository :: git.ucc.asn.au