Jeremy Tan [Thu, 31 Oct 2013 23:34:56 +0000 (07:34 +0800)]
fix cites that I broke...
Jeremy Tan [Thu, 31 Oct 2013 23:34:56 +0000 (07:34 +0800)]
Spell check!!!!!
Jeremy Tan [Thu, 31 Oct 2013 23:34:56 +0000 (07:34 +0800)]
Minor fixes
Jeremy Tan [Thu, 31 Oct 2013 23:00:53 +0000 (07:00 +0800)]
Merge branch 'master' of https://github.com/jtanx/MCTX3420
Jeremy Tan [Thu, 31 Oct 2013 22:56:45 +0000 (06:56 +0800)]
Attempt to get image streaming page back from the dead (untested).
Jeremy Tan [Thu, 31 Oct 2013 05:28:40 +0000 (13:28 +0800)]
Some fixes
Callum [Thu, 31 Oct 2013 22:33:07 +0000 (06:33 +0800)]
Update dilatometer.c
Sam Moore [Thu, 31 Oct 2013 21:33:34 +0000 (05:33 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420
Sam Moore [Thu, 31 Oct 2013 21:32:57 +0000 (05:32 +0800)]
Draft of Report
... It's too big :S
Sam Moore [Thu, 31 Oct 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Sam Moore [Thu, 31 Oct 2013 10:17:31 +0000 (18:17 +0800)]
Work on report
Include Justin's section (all of Introduction)
Jeremy Tan [Thu, 31 Oct 2013 05:28:40 +0000 (13:28 +0800)]
Some fixes
Sam Moore [Wed, 30 Oct 2013 17:00:14 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Tue, 29 Oct 2013 06:12:29 +0000 (14:12 +0800)]
switch to fixed passwords (based on month/year)
hey, adrian wanted it
Jeremy Tan [Wed, 30 Oct 2013 14:11:49 +0000 (22:11 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420
Callum [Wed, 30 Oct 2013 13:09:14 +0000 (21:09 +0800)]
Update dilatometer.h
Jeremy Tan [Wed, 30 Oct 2013 12:32:42 +0000 (20:32 +0800)]
Update report, add stuff on OS and PWM
Sam Moore [Wed, 30 Oct 2013 04:49:09 +0000 (12:49 +0800)]
Add usleep to strain.c just in case...
Irrational fear of mutexes failing...
Sam Moore [Wed, 30 Oct 2013 04:39:58 +0000 (12:39 +0800)]
Fix dilatometer, other misc stuff
Camera_GetImage needs to modify IplImage* not CvMat*
Other bug fixes.
Jeremy Tan [Wed, 30 Oct 2013 01:22:57 +0000 (09:22 +0800)]
add fclose to shadow login
Callum [Tue, 29 Oct 2013 18:29:56 +0000 (02:29 +0800)]
Update dilatometer.c
Callum [Tue, 29 Oct 2013 18:29:40 +0000 (11:29 -0700)]
Merge pull request #73 from Callum-/dilatometer
got some more test images from earlier iterations
Callum [Tue, 29 Oct 2013 18:13:07 +0000 (02:13 +0800)]
got some more test images from earlier iterations
Sam Moore [Tue, 29 Oct 2013 17:00:08 +0000 (01:00 +0800)]
Automatic commit of irc logs
Callum [Tue, 29 Oct 2013 16:55:41 +0000 (09:55 -0700)]
Merge pull request #72 from Callum-/dilatometer
Added a dilatometer "sensor"
Callum [Tue, 29 Oct 2013 16:45:28 +0000 (00:45 +0800)]
Added a dilatometer "sensor"
Callum [Tue, 29 Oct 2013 16:27:27 +0000 (00:27 +0800)]
Update dilatometer.h
Callum [Tue, 29 Oct 2013 15:59:27 +0000 (08:59 -0700)]
Merge pull request #71 from Callum-/dilatometer
changed some variables to defines
Callum [Tue, 29 Oct 2013 15:57:57 +0000 (23:57 +0800)]
changed some variables to defines
Callum [Tue, 29 Oct 2013 15:06:04 +0000 (08:06 -0700)]
Merge pull request #70 from Callum-/dilatometer
Dilatometer
Callum [Tue, 29 Oct 2013 15:04:38 +0000 (23:04 +0800)]
modified image.c
Callum [Tue, 29 Oct 2013 15:02:46 +0000 (23:02 +0800)]
Changed capture initilisation
Jeremy Tan [Tue, 29 Oct 2013 14:35:49 +0000 (22:35 +0800)]
report changes. longer!?!?!
Callum [Tue, 29 Oct 2013 14:26:42 +0000 (22:26 +0800)]
Delete test_edge.jpg
moved
Callum [Tue, 29 Oct 2013 14:26:38 +0000 (22:26 +0800)]
Delete testimage.jpg
moved
Callum [Tue, 29 Oct 2013 14:26:33 +0000 (22:26 +0800)]
Delete test_edge_avg.jpg
moved
Callum [Tue, 29 Oct 2013 14:26:15 +0000 (22:26 +0800)]
Delete test_blurred.jpg
moved
Callum [Tue, 29 Oct 2013 13:43:47 +0000 (06:43 -0700)]
Merge pull request #69 from Callum-/dilatometer
Done a bunch of changes to image handling
Callum [Tue, 29 Oct 2013 13:14:02 +0000 (21:14 +0800)]
Done a bunch of changes to image handling
Jeremy Tan [Tue, 29 Oct 2013 07:03:27 +0000 (15:03 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420
Sam Moore [Tue, 29 Oct 2013 04:56:41 +0000 (12:56 +0800)]
Add dilatometer as sensor
Changed type of functions as needed and called Sensor_Add appropriately.
Jeremy Tan [Tue, 29 Oct 2013 06:58:59 +0000 (14:58 +0800)]
writeup
Sam Moore [Tue, 29 Oct 2013 04:56:41 +0000 (12:56 +0800)]
Add dilatometer as sensor
Changed type of functions as needed and called Sensor_Add appropriately.
Sam Moore [Mon, 28 Oct 2013 17:00:14 +0000 (01:00 +0800)]
Automatic commit of irc logs
Callum [Mon, 28 Oct 2013 15:09:04 +0000 (08:09 -0700)]
Merge pull request #68 from Callum-/dilatometer
Finished Dilatometer
Callum [Mon, 28 Oct 2013 14:59:58 +0000 (22:59 +0800)]
Wrote code to implement camera
Callum [Mon, 28 Oct 2013 14:58:26 +0000 (22:58 +0800)]
Merge remote-tracking branch 'upstream/master' into dilatometer
Callum [Mon, 28 Oct 2013 14:20:16 +0000 (22:20 +0800)]
comment
Jeremy Tan [Mon, 28 Oct 2013 14:15:13 +0000 (22:15 +0800)]
Add in change password
Jeremy Tan [Mon, 28 Oct 2013 14:04:25 +0000 (22:04 +0800)]
use post for login. how did this get lost?
Jeremy Tan [Mon, 28 Oct 2013 13:38:48 +0000 (21:38 +0800)]
Fix some minor compiler issues
Callum [Mon, 28 Oct 2013 13:35:53 +0000 (21:35 +0800)]
edited dilatometer
Jeremy Tan [Mon, 28 Oct 2013 13:21:47 +0000 (21:21 +0800)]
Merge branch 'users'
Conflicts:
server/parameters
Resolved to users branch
Jeremy Tan [Mon, 28 Oct 2013 13:12:38 +0000 (21:12 +0800)]
Fix link on login page
Jeremy Tan [Mon, 28 Oct 2013 13:10:41 +0000 (21:10 +0800)]
remove own static stuff. use what's in place
Jeremy Tan [Mon, 28 Oct 2013 13:03:55 +0000 (21:03 +0800)]
remove old stuff
Jeremy Tan [Mon, 28 Oct 2013 12:59:13 +0000 (20:59 +0800)]
Nicen the rego form and add back the change password form
Sam Moore [Mon, 28 Oct 2013 07:48:35 +0000 (15:48 +0800)]
Merge branch 'master' of github:szmoore/MCTX3420 into report
Conflicts:
server/fastcgi.c
server/parameters
Also... calibrated sensors
Sam Moore [Sun, 27 Oct 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Sun, 27 Oct 2013 15:19:06 +0000 (23:19 +0800)]
segment the admin gui
it has been segmented
fact:
usercake encourages spaghetti code
awfhauiwfauiwfauwblaaargh
may have to add back:
stuff
mailing won't work without an mta.
running postfix on the bbb...
Sam Moore [Sun, 27 Oct 2013 08:39:59 +0000 (16:39 +0800)]
Work on report
Blergh
Jeremy Tan [Sun, 27 Oct 2013 07:47:35 +0000 (15:47 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420
Jeremy Tan [Sun, 27 Oct 2013 07:45:46 +0000 (15:45 +0800)]
Disallow control codes in urldecode
Sam Moore [Sat, 26 Oct 2013 17:00:10 +0000 (01:00 +0800)]
Automatic commit of irc logs
Callum [Sat, 26 Oct 2013 07:27:13 +0000 (00:27 -0700)]
Merge pull request #67 from Callum-/master
Added some more tests
Callum [Sat, 26 Oct 2013 07:25:22 +0000 (15:25 +0800)]
Added some more tests
Callum [Sat, 26 Oct 2013 07:15:58 +0000 (00:15 -0700)]
Merge pull request #66 from Callum-/master
More camera Stuff
Callum [Sat, 26 Oct 2013 07:13:14 +0000 (15:13 +0800)]
added original image
Callum [Sat, 26 Oct 2013 07:08:54 +0000 (15:08 +0800)]
testing images, with line imposed
Callum [Sat, 26 Oct 2013 06:59:22 +0000 (14:59 +0800)]
renamed functions to microscope, redid Read fnctn
Jeremy Tan [Sat, 26 Oct 2013 04:46:20 +0000 (12:46 +0800)]
Minor changes
Jeremy Tan [Sat, 26 Oct 2013 04:02:20 +0000 (12:02 +0800)]
Add links to the relevant help page for SBD
Jeremy Tan [Sat, 26 Oct 2013 03:55:58 +0000 (11:55 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Sat, 26 Oct 2013 03:55:26 +0000 (11:55 +0800)]
Update the block diagram
Jeremy Tan [Sat, 26 Oct 2013 01:39:56 +0000 (09:39 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420 into users
Conflicts:
server/fastcgi.c
server/parameters
Sam Moore [Fri, 25 Oct 2013 17:00:06 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Fri, 25 Oct 2013 12:51:19 +0000 (20:51 +0800)]
Merge branch 'users' of https://github.com/szmoore/MCTX3420 into users
Jeremy Tan [Mon, 21 Oct 2013 04:22:50 +0000 (12:22 +0800)]
modified version to get control key
Jeremy Tan [Mon, 21 Oct 2013 03:26:55 +0000 (11:26 +0800)]
manual merge of fastcgi.c
Sam Moore [Sun, 20 Oct 2013 14:00:14 +0000 (22:00 +0800)]
Add gmail chat log
We should just keep using IRC :P
Sam Moore [Sun, 20 Oct 2013 13:35:12 +0000 (21:35 +0800)]
Begin modifying UserCake
Create admin upload page for uploading / purging users. Incomplete.
Note that this page needs to be secured somehow.
Realised that we probably need to add the UserCake install scripts as well, so we can
customise the database and other things when it is installed.
Modified something in the server too apparently.
I love it when I forget what I actually did...
Sam Moore [Sun, 20 Oct 2013 08:36:01 +0000 (16:36 +0800)]
Modify FastCGI server to use MySQL for auth
Made some general improvements to Login_Handler and how the "auth_uri" is dealt with.
Called strsep, but it's not (that) evil since it doesn't do anything I wouldn't have done with boilerplate anyway.
MySQL for auth tested and appears to work. Using SHA6 instead of md5 (!) hashes.
Sam Moore [Sun, 20 Oct 2013 05:02:54 +0000 (13:02 +0800)]
Add UserCake
We might be able to build on this to make a user management system.
UserCake Version: 2.0.2
http://usercake.com
This commit includes the original UserCake source.
Many files will need to be removed and/or rewritten.
UserCake uses MySQL for storing user information.
There is a C API for interfacing with MySQL. Hopefully that will work.
Jeremy Tan [Fri, 25 Oct 2013 12:39:20 +0000 (20:39 +0800)]
more reporting
Sam Moore [Thu, 24 Oct 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Jeremy Tan [Thu, 24 Oct 2013 14:44:48 +0000 (22:44 +0800)]
More updates to report
Jeremy Tan [Thu, 24 Oct 2013 11:53:01 +0000 (04:53 -0700)]
Merge pull request #65 from jtanx/master
Add POST handling and properly URL Decode GET/POST requests
Jeremy Tan [Thu, 24 Oct 2013 11:50:50 +0000 (19:50 +0800)]
fix some gui stuff
Jeremy Tan [Thu, 24 Oct 2013 11:37:32 +0000 (19:37 +0800)]
Only use POST for login, and only if the GET string is empty
Fix 'friendly name' too.
Jeremy Tan [Thu, 24 Oct 2013 11:17:51 +0000 (19:17 +0800)]
Merge branch 'master' of https://github.com/szmoore/MCTX3420.git
Jeremy Tan [Thu, 24 Oct 2013 11:17:27 +0000 (19:17 +0800)]
Add POST handling and URLDecode POST/GET request data. Switch Login to use POST instead of GET.
Hopefully this doesn't introduce any new bugs.
Sam Moore [Thu, 24 Oct 2013 09:51:07 +0000 (02:51 -0700)]
Merge pull request #64 from justinjessada/master
Modified data page and added some report stuff
Jeremy Tan [Thu, 24 Oct 2013 06:12:43 +0000 (14:12 +0800)]
Work on report
Sam Moore [Wed, 23 Oct 2013 17:00:07 +0000 (01:00 +0800)]
Automatic commit of irc logs
Justin Kruger [Wed, 23 Oct 2013 16:52:04 +0000 (00:52 +0800)]
Modified data page and added some report stuff
Jeremy Tan [Wed, 23 Oct 2013 14:42:57 +0000 (22:42 +0800)]
Fix button disable bug
Jeremy Tan [Wed, 23 Oct 2013 14:29:36 +0000 (22:29 +0800)]
Writeup stuff. blah blah blah
Jeremy Tan [Wed, 23 Oct 2013 12:56:47 +0000 (20:56 +0800)]
Add in live values data page + minor gui fixes
Jeremy Tan [Wed, 23 Oct 2013 12:54:22 +0000 (20:54 +0800)]
temp
Jeremy Tan [Wed, 23 Oct 2013 11:38:02 +0000 (19:38 +0800)]
fix gitignore
UCC git Repository :: git.ucc.asn.au
git.ucc.asn.au / matches / MCTX3420.git / log