2ff9d3614a665805c166b317b5aa42d6156aa701 3642c2257ff88fafccc0557595fd8937d2e1e585 David James online@davidcjames.com http://github.com/djwonk/voting/commit/d35fb405df079168127bc6fd210b7e34d5ca0546 d35fb405df079168127bc6fd210b7e34d5ca0546

2009-06-06T16:15:20-07:00

Merge commit 'dj_mods_of_zapnap/master' 3577e2565d64550b3ebd11b70283d50bb03699b6 David James online@davidcjames.com eb1f4fa1f45afc84a370bde96f8e0d88df4332d0 03aa6ab06d5ee7a1b3738b832005a9f9ca377a31 David James online@davidcjames.com http://github.com/djwonk/voting/commit/2ff9d3614a665805c166b317b5aa42d6156aa701 2ff9d3614a665805c166b317b5aa42d6156aa701

2009-06-06T13:09:08-07:00

Merge commit 'zapnap/master' 933038820e54e3d6cccd528a76e448717eece540 David James online@davidcjames.com e9c5e1e2fe77bbf018c41adcfe7f629100d821ef David James online@davidcjames.com http://github.com/djwonk/voting/commit/eb1f4fa1f45afc84a370bde96f8e0d88df4332d0 eb1f4fa1f45afc84a370bde96f8e0d88df4332d0

2009-06-06T13:04:10-07:00

Clearing out the old. Kept old code in the old_code branch 4b825dc642cb6eb9a060e54bf8d69288fbee4904 David James online@davidcjames.com bad6324e14e269ea21daa0be120c29d52e06cde8 David James online@davidcjames.com http://github.com/djwonk/voting/commit/3642c2257ff88fafccc0557595fd8937d2e1e585 3642c2257ff88fafccc0557595fd8937d2e1e585

2009-06-06T13:00:54-07:00

Added API notes from earlier codebase 3577e2565d64550b3ebd11b70283d50bb03699b6 David James online@davidcjames.com b5a06e1a16dfbd70b5510427234e8140357a9389 David James online@davidcjames.com http://github.com/djwonk/voting/commit/bad6324e14e269ea21daa0be120c29d52e06cde8 bad6324e14e269ea21daa0be120c29d52e06cde8

2009-06-06T12:56:24-07:00

corrected typo: canceled -> cancelled af08dfac3105c0fc69c40860c6fdfe49a485393e David James online@davidcjames.com 232e4b5487de90fdfc6f4c8367044291167328c6 David James online@davidcjames.com http://github.com/djwonk/voting/commit/b5a06e1a16dfbd70b5510427234e8140357a9389 b5a06e1a16dfbd70b5510427234e8140357a9389

2009-06-06T12:52:17-07:00

removed extra slash in database_uri 1bcb03c3c5a41abe57fa8919f7cf5b8f67f15e80 David James online@davidcjames.com a5d62ca8b234577e4b2450e3cbeaacbe7763480f David James online@davidcjames.com http://github.com/djwonk/voting/commit/232e4b5487de90fdfc6f4c8367044291167328c6 232e4b5487de90fdfc6f4c8367044291167328c6

2009-06-06T12:48:22-07:00

Quick refactoring of File.expand_path ... dirname(__FILE__) 791be19287703aaecd1d7c76de77444977cc360b David James online@davidcjames.com 03aa6ab06d5ee7a1b3738b832005a9f9ca377a31 David James online@davidcjames.com http://github.com/djwonk/voting/commit/a5d62ca8b234577e4b2450e3cbeaacbe7763480f a5d62ca8b234577e4b2450e3cbeaacbe7763480f

2009-06-06T12:07:44-07:00

Stylistic change to test; clarifies the second candidate 9b2e7cac6b3bc3207eda795168577bc2216df96b David James online@davidcjames.com ce8d2a02db1b0c3ba8f0a7c3c24ac62bd2996141 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/03aa6ab06d5ee7a1b3738b832005a9f9ca377a31 03aa6ab06d5ee7a1b3738b832005a9f9ca377a31

2009-06-04T10:28:12-07:00

fix logging 933038820e54e3d6cccd528a76e448717eece540 Nick Plante nap@zerosum.org bcbd9434a77f00c68fc69bd6a8ba610f207c775a Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/ce8d2a02db1b0c3ba8f0a7c3c24ac62bd2996141 ce8d2a02db1b0c3ba8f0a7c3c24ac62bd2996141

2009-06-03T11:49:14-07:00

rspec hpricot matchers ebed91d9f72dda21d450f6b20e48cdd1714a2a98 Nick Plante nap@zerosum.org 91992247088ee697dc5b5da57c9bcca3a2fc15f6 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/bcbd9434a77f00c68fc69bd6a8ba610f207c775a bcbd9434a77f00c68fc69bd6a8ba610f207c775a

2009-06-03T10:52:51-07:00

path_to url helper f345ccc9482f9bdc178a9b46368fc35617830eb2 Nick Plante nap@zerosum.org d56e42b76ef52e8389d95837b966f322d65b6c6b Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/91992247088ee697dc5b5da57c9bcca3a2fc15f6 91992247088ee697dc5b5da57c9bcca3a2fc15f6

2009-06-03T10:52:26-07:00

path_to url helper 827680229b1aeb380c0bc9cc9c56943724cc021b Nick Plante nap@zerosum.org b6b872406c1551f8cd2f5c2b67956a54cc4e2f7a Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/d56e42b76ef52e8389d95837b966f322d65b6c6b d56e42b76ef52e8389d95837b966f322d65b6c6b

2009-06-03T10:51:41-07:00

text change 6673d0fab17d845a47ba937a9401e3bd708e5cd1 Nick Plante nap@zerosum.org b598ef58558f136a76528a48bb88579b19d9ac46 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/b6b872406c1551f8cd2f5c2b67956a54cc4e2f7a b6b872406c1551f8cd2f5c2b67956a54cc4e2f7a

2009-06-03T07:59:17-07:00

serve static assets 19d33fa5c5e40f0637065d5162c6667931ef4d20 Nick Plante nap@zerosum.org ca9bae2c7ba380868d0ef4d374c8c35ffe198ab7 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/b598ef58558f136a76528a48bb88579b19d9ac46 b598ef58558f136a76528a48bb88579b19d9ac46

2009-06-03T07:22:37-07:00

update launch instructions 1607ad2007c1dfc56fabc2dd28e01178cf5f5871 Nick Plante nap@zerosum.org d7fb8ae3679972648816054a13eb7a936a3f777d Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/ca9bae2c7ba380868d0ef4d374c8c35ffe198ab7 ca9bae2c7ba380868d0ef4d374c8c35ffe198ab7

2009-06-03T07:20:13-07:00

move to a modular Sinatra app use vegas to launch 28d1b16d2056f97b73cbd06a0877bd0b3b958922 Nick Plante nap@zerosum.org 4b60c52a20cc9141e773ab48ac81f293008b865c Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/d7fb8ae3679972648816054a13eb7a936a3f777d d7fb8ae3679972648816054a13eb7a936a3f777d

2009-06-02T13:53:30-07:00

add factory girl to list of required gems 1416e47111323f6c06f7a68d95fadb63f29c253f Nick Plante nap@zerosum.org 2d02034733a3c0872b9f1868ca673bb23c9e0a25 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/4b60c52a20cc9141e773ab48ac81f293008b865c 4b60c52a20cc9141e773ab48ac81f293008b865c

2009-06-02T13:51:45-07:00

remove sample database 89d67800d86589f7faf7e4e48d5c06f11fc5395e Nick Plante nap@zerosum.org 20be6bf98693b5f0444764306557b23a7a54ddc2 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/2d02034733a3c0872b9f1868ca673bb23c9e0a25 2d02034733a3c0872b9f1868ca673bb23c9e0a25

2009-06-02T13:50:48-07:00

ignoramus e9eb19dbf105fc1760d27c8020c9fda40ef2a954 Nick Plante nap@zerosum.org 7430f8ee1b2caf9dc3c588237414f9c3a26e3c64 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/20be6bf98693b5f0444764306557b23a7a54ddc2 20be6bf98693b5f0444764306557b23a7a54ddc2

2009-06-02T13:40:10-07:00

warning -- work in progress 95bbc6328a94a38565ce356a0f917db82a5a3c0e Nick Plante nap@zerosum.org Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/7430f8ee1b2caf9dc3c588237414f9c3a26e3c64 7430f8ee1b2caf9dc3c588237414f9c3a26e3c64

2009-06-02T13:38:20-07:00

initial import 05352713b9988d3af25deef39733b4497abc0b65 Nick Plante nap@zerosum.org 2fd8340acb7e37cbeb195d9ddf5825abd428dab2 David James djwonk@collectiveinsight.net http://github.com/djwonk/voting/commit/e9c5e1e2fe77bbf018c41adcfe7f629100d821ef e9c5e1e2fe77bbf018c41adcfe7f629100d821ef

2009-03-10T12:33:42-07:00

changes dcf4e8cfd5298bad86d5019bde58a8b4eaa42f92 David James djwonk@collectiveinsight.net 28cbb325bd413abc895d195bb8c2a7c33a01a6fc David James djwonk@collectiveinsight.net http://github.com/djwonk/voting/commit/2fd8340acb7e37cbeb195d9ddf5825abd428dab2 2fd8340acb7e37cbeb195d9ddf5825abd428dab2

2009-03-10T12:02:39-07:00

big work flow story type BS 6f5cdcb53b76ce2c8ed41ed231bdb3350935b83d David James djwonk@collectiveinsight.net 25926357057b812252bcf5a4bd4bd9b2e169c30a Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/28cbb325bd413abc895d195bb8c2a7c33a01a6fc 28cbb325bd413abc895d195bb8c2a7c33a01a6fc

2009-03-10T11:39:57-07:00

add boilerplate specs 857ea9537b0b6cf7f764b6edfb2dbcd37a77f791 Nick Plante nap@zerosum.org 175f084f848c10fbd5446c2fbc62cab7df8a5e4c Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/25926357057b812252bcf5a4bd4bd9b2e169c30a 25926357057b812252bcf5a4bd4bd9b2e169c30a

2009-03-10T10:58:24-07:00

update description and owners 268237941581ff004060b56220f949d6acacb606 Nick Plante nap@zerosum.org f9f4cd04ee7f183e8c59cb7ab0cb76f49cdfcbf2 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/175f084f848c10fbd5446c2fbc62cab7df8a5e4c 175f084f848c10fbd5446c2fbc62cab7df8a5e4c

2009-03-10T10:55:18-07:00

replaced with README.rdoc 3c533bf70df84e70b70e590bca3b3825ac96e17e Nick Plante nap@zerosum.org 1dd90cfe59b732b73697d20d5243350a95f75c0d Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/f9f4cd04ee7f183e8c59cb7ab0cb76f49cdfcbf2 f9f4cd04ee7f183e8c59cb7ab0cb76f49cdfcbf2

2009-03-10T10:51:31-07:00

first draft election model 3f58205b6e69cdcb49edca10766ea32315a1328a Nick Plante nap@zerosum.org 20678ccb40bfd6a06690d5a6b9731ac7a217eae2 Nick Plante nap@zerosum.org http://github.com/djwonk/voting/commit/1dd90cfe59b732b73697d20d5243350a95f75c0d 1dd90cfe59b732b73697d20d5243350a95f75c0d

2009-03-10T10:47:47-07:00

update for Sinatra 0.9.1 testing syntax de2d0216dfafb433a3f1a6f286212994eac6c0f5 Nick Plante nap@zerosum.org 82ec695826711022fd228fdaf67a4719f4bc6f0a David James djwonk@collectiveinsight.net http://github.com/djwonk/voting/commit/20678ccb40bfd6a06690d5a6b9731ac7a217eae2 20678ccb40bfd6a06690d5a6b9731ac7a217eae2

2009-02-20T11:56:56-08:00

Copied files from http://github.com/zapnap/sinatra-template/tree/master 8dd897b574d81e19ced816a53bec8804d1edf330 David James djwonk@collectiveinsight.net David James djwonk@collectiveinsight.net http://github.com/djwonk/voting/commit/82ec695826711022fd228fdaf67a4719f4bc6f0a 82ec695826711022fd228fdaf67a4719f4bc6f0a

2009-01-25T13:21:04-08:00

1st commit 543b9bebdc6bd5c4b22136034a95dd097a57d3dd David James djwonk@collectiveinsight.net