ff6f31e4d13c8b39691f32b2a84f89ea1250baef Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/21412924f26d9fdb3003e88aefd86562cd5d680d 21412924f26d9fdb3003e88aefd86562cd5d680d 2009-11-12T17:01:17-08:00 2009-11-12T17:01:17-08:00 made account/empty_trash get rid of trashed card, too 95bd6b8ff9e209251478e4bc02d86949f9c81c0f Ethan McCutchen ethan@cutch.(none) 4f0c049a2293fe672da2e0c13e5104cc340a8b15 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/ff6f31e4d13c8b39691f32b2a84f89ea1250baef ff6f31e4d13c8b39691f32b2a84f89ea1250baef 2009-11-12T16:52:23-08:00 2009-11-12T16:52:23-08:00 patched deny_all not to mess with trashed requests 71903d6fb211aac181e148a73883aeb4b0cd2819 Ethan McCutchen ethan@cutch.(none) 5d7880506b970821b2c33c74fa1e5826a5538899 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/4f0c049a2293fe672da2e0c13e5104cc340a8b15 4f0c049a2293fe672da2e0c13e5104cc340a8b15 2009-11-12T15:58:57-08:00 2009-11-12T15:58:57-08:00 fixed nested head tags 637c82012732a351fa22d677dce83aa67d0df12f Ethan McCutchen ethan@cutch.(none) 0b5406bcdf35c95aca7463ce2c678a40493460bb 5c85b809f6a636deba10305e2e0d1ba7636cceca Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/5d7880506b970821b2c33c74fa1e5826a5538899 5d7880506b970821b2c33c74fa1e5826a5538899 2009-11-12T11:06:50-08:00 2009-11-12T11:06:50-08:00 resolved merge another damn conflict fa82dbd299a5176720b002b109d7a57b6a8dcd0d Ethan McCutchen ethan@cutch.(none) 6c61b9cd2df9fdbf3c03588fc67788e8da14c90a f9b0b4350ed5bb39be14fa1be4ac58cf6b072746 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/0b5406bcdf35c95aca7463ce2c678a40493460bb 0b5406bcdf35c95aca7463ce2c678a40493460bb 2009-11-12T11:06:14-08:00 2009-11-12T11:06:14-08:00 resolved merge staging conflict fa82dbd299a5176720b002b109d7a57b6a8dcd0d Ethan McCutchen ethan@cutch.(none) 1caa3dd317d625a6c38fadb0abd55d0c0f00c0a9 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/f9b0b4350ed5bb39be14fa1be4ac58cf6b072746 f9b0b4350ed5bb39be14fa1be4ac58cf6b072746 2009-11-12T11:03:07-08:00 2009-11-12T11:03:07-08:00 fixed user blocking bug fa01fb351533d1197e1b10158dee5f552171f005 Ethan McCutchen ethan@cutch.(none) 9911ced7e6834ecbf88a4240024a6874132d1320 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/1caa3dd317d625a6c38fadb0abd55d0c0f00c0a9 1caa3dd317d625a6c38fadb0abd55d0c0f00c0a9 2009-11-11T15:34:04-08:00 2009-11-11T15:34:04-08:00 added deprecation note e38a5315863eaea95902e7e1de03a348ea9fb874 Ethan McCutchen ethan@cutch.(none) d51ce1f15f38d42f46e88f537bf74b7e0ec765f1 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/9911ced7e6834ecbf88a4240024a6874132d1320 9911ced7e6834ecbf88a4240024a6874132d1320 2009-11-11T14:48:00-08:00 2009-11-11T14:48:00-08:00 deny_all and empty_trash methods 531181af33d24cf0b04988c01f8ebec5784adcfe Ethan McCutchen ethan@cutch.(none) 3f11902d3a26379c5a21c98e8ea7f872e18b39f7 d51ce1f15f38d42f46e88f537bf74b7e0ec765f1 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/5c85b809f6a636deba10305e2e0d1ba7636cceca 5c85b809f6a636deba10305e2e0d1ba7636cceca 2009-11-11T12:32:20-08:00 2009-11-11T12:32:20-08:00 Merge branch 'staging' f9b93ed7ae2500853ce578e9d321418a030453f8 Lewis Hoffman lewis@grasscommons.org 807ed523d744d17f66ae9ad53e1f81ba7c960599 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/d51ce1f15f38d42f46e88f537bf74b7e0ec765f1 d51ce1f15f38d42f46e88f537bf74b7e0ec765f1 2009-11-11T10:21:25-08:00 2009-11-11T10:21:25-08:00 fixed it so signup captcha actually stops unwanted requests 2cc2d1ee34fe7725e5d94b2a93298b3a94280ae1 Ethan McCutchen ethan@cutch.(none) 6c61b9cd2df9fdbf3c03588fc67788e8da14c90a 807ed523d744d17f66ae9ad53e1f81ba7c960599 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/3f11902d3a26379c5a21c98e8ea7f872e18b39f7 3f11902d3a26379c5a21c98e8ea7f872e18b39f7 2009-11-10T17:23:35-08:00 2009-11-10T17:23:35-08:00 Merge branch 'staging' Conflicts: features/pointer_full_input.feature a911301dcf5830b88752b00ea08edb7ade7d0e03 Lewis Hoffman lewis@grasscommons.org ab1302ad9797094a7028039c8d36ed8cfde93542 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/807ed523d744d17f66ae9ad53e1f81ba7c960599 807ed523d744d17f66ae9ad53e1f81ba7c960599 2009-11-06T13:18:39-08:00 2009-11-06T13:18:39-08:00 fix cucumber tests: autoname, google_maps, full_input aa7cb40972591c9b1fbece2457a3c0d6bc714267 Lewis Hoffman lewis@grasscommons.org 8be129c007b34c1624754c0be9c6da86c0888fe7 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/ab1302ad9797094a7028039c8d36ed8cfde93542 ab1302ad9797094a7028039c8d36ed8cfde93542 2009-11-05T17:00:21-08:00 2009-11-05T17:00:21-08:00 unstick cucumber 2dde800bfdc30f57b7aa0836b97d58dfb89d58d2 Lewis Hoffman lewis@grasscommons.org f5d0eef01b39c4da0c3fca99101fed64d3848a3a Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/8be129c007b34c1624754c0be9c6da86c0888fe7 8be129c007b34c1624754c0be9c6da86c0888fe7 2009-11-04T18:31:17-08:00 2009-11-04T18:31:17-08:00 fix jquery asset config 4a87833f3cdfbdb1a77cb8dab1075f2d2bd4c300 Lewis Hoffman lewis@grasscommons.org 7567a0365814be04e72fb6075580f8b0de471bfc bcef274f2d8a57a433b6e7472b5e955cc24d30f2 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/f5d0eef01b39c4da0c3fca99101fed64d3848a3a f5d0eef01b39c4da0c3fca99101fed64d3848a3a 2009-11-04T18:26:36-08:00 2009-11-04T18:26:36-08:00 Merge branch 'staging' of git@pinz:wagn into staging bd4f22553678095077c757c37c7b74c4d54e0193 Lewis Hoffman lewis@grasscommons.org 4a5520bc7d6283abe0b52015ab2e361d66adb4fe Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/7567a0365814be04e72fb6075580f8b0de471bfc 7567a0365814be04e72fb6075580f8b0de471bfc 2009-11-04T18:26:11-08:00 2009-11-04T18:26:11-08:00 recaptcha ready for testing; added jQuery 13fe0b570469989b80108f6a1cd96af9e9a945f3 Lewis Hoffman lewis@grasscommons.org 4a5520bc7d6283abe0b52015ab2e361d66adb4fe Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/bcef274f2d8a57a433b6e7472b5e955cc24d30f2 bcef274f2d8a57a433b6e7472b5e955cc24d30f2 2009-11-03T17:51:23-08:00 2009-11-03T17:51:23-08:00 fixed cardtype link c39aebb8ea4aaf6ad7a875f953ba5de28440be50 Ethan McCutchen ethan@cutch.(none) 61d8fbb1c2ca66a461f0749a7c83667b1c6b81d1 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/4a5520bc7d6283abe0b52015ab2e361d66adb4fe 4a5520bc7d6283abe0b52015ab2e361d66adb4fe 2009-11-03T09:41:42-08:00 2009-11-03T09:41:42-08:00 remove debugger statement 131d9c940022c89d31666a0375011775f5928da6 Lewis Hoffman lewis@grasscommons.org 0bfe8d2efd632e999132f2378b2372d4216e50d3 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/61d8fbb1c2ca66a461f0749a7c83667b1c6b81d1 61d8fbb1c2ca66a461f0749a7c83667b1c6b81d1 2009-11-03T09:36:28-08:00 2009-11-03T09:36:28-08:00 fix thinko in layout logic e77255a306448e1b30823884df5175af98e24afa Lewis Hoffman lewis@grasscommons.org 5bd2d8506e40d6400ea7ff48563604ec76232b95 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/0bfe8d2efd632e999132f2378b2372d4216e50d3 0bfe8d2efd632e999132f2378b2372d4216e50d3 2009-11-02T17:49:20-08:00 2009-11-02T17:49:20-08:00 specify layout in url 9ca42a4b2f2029dcff26582546a2227d63bc9fe8 Lewis Hoffman lewis@grasscommons.org 004e590a6eef5b3b12fcfbdf3aaba003ddc2e4cb Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/5bd2d8506e40d6400ea7ff48563604ec76232b95 5bd2d8506e40d6400ea7ff48563604ec76232b95 2009-11-02T17:46:18-08:00 2009-11-02T17:46:18-08:00 fix default *layout ea142349b24e93b80ee2ceab1d619fe446f28dc2 Lewis Hoffman lewis@grasscommons.org 618d525ab42e5c7b9b68738ad510abd6c4907b0f Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/004e590a6eef5b3b12fcfbdf3aaba003ddc2e4cb 004e590a6eef5b3b12fcfbdf3aaba003ddc2e4cb 2009-11-02T15:58:39-08:00 2009-11-02T15:58:39-08:00 test data for user table cleanup 02ac2b45a2cb9af94c7758aa6fa4c6c1f58e3fa5 Lewis Hoffman lewis@grasscommons.org 413e244a9c90df0119e063091308beeab17c0f37 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/618d525ab42e5c7b9b68738ad510abd6c4907b0f 618d525ab42e5c7b9b68738ad510abd6c4907b0f 2009-11-02T15:58:16-08:00 2009-11-02T15:58:16-08:00 cleanup user table b18288664ae008334281522a693a697618756fe4 Lewis Hoffman lewis@grasscommons.org 675d446cc75e6615aa4c7ab592f5ff6a91bf91da Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/413e244a9c90df0119e063091308beeab17c0f37 413e244a9c90df0119e063091308beeab17c0f37 2009-11-02T10:27:07-08:00 2009-11-02T10:27:07-08:00 small refactor of captcha system 7edc398b4ea8e1eda4b61c4374f287ce808caefc Lewis Hoffman lewis@grasscommons.org 66f7bfb059662714e4976c7ef13f295a5ef14967 0288bbb10113e7c1ee0b8c4a140675afe96e0865 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/675d446cc75e6615aa4c7ab592f5ff6a91bf91da 675d446cc75e6615aa4c7ab592f5ff6a91bf91da 2009-10-29T13:27:10-07:00 2009-10-29T13:27:10-07:00 Merge branch 'staging' of git@pinz:wagn into staging 3ce70b5fe4ed9579708c53787dd648bd785fded3 Lewis Hoffman lewis@grasscommons.org b706b30bc4eabca7ea9a8178f4b53932aad0557f Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/66f7bfb059662714e4976c7ef13f295a5ef14967 66f7bfb059662714e4976c7ef13f295a5ef14967 2009-10-29T13:26:05-07:00 2009-10-29T13:26:05-07:00 first round of captcha changes, including controller refactoring afa6f9193e415c16fd8f2280b89a3e57f15ae74e Lewis Hoffman lewis@grasscommons.org c24f3dc00839f0b8a65c7883a41af4663e570151 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/b706b30bc4eabca7ea9a8178f4b53932aad0557f b706b30bc4eabca7ea9a8178f4b53932aad0557f 2009-10-29T13:25:35-07:00 2009-10-29T13:25:35-07:00 add recaptca plugin (with local changes) 37f04a413a60931f0b06654b5c396dfbd12ef388 Lewis Hoffman lewis@grasscommons.org 9e50535ea4fb1f8d3fe2fc623fefe347bef0f933 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/c24f3dc00839f0b8a65c7883a41af4663e570151 c24f3dc00839f0b8a65c7883a41af4663e570151 2009-10-29T13:19:27-07:00 2009-10-29T13:19:27-07:00 remove spec from file: gets run at odd times 6d98117879d1b2d7874fbc5f0ce3b9b9aa785180 Lewis Hoffman lewis@grasscommons.org a729def5e8e5d316492f4a822bfef780911c09e5 Lewis Hoffman lewis@grasscommons.org http://github.com/wagn/wagn/commit/9e50535ea4fb1f8d3fe2fc623fefe347bef0f933 9e50535ea4fb1f8d3fe2fc623fefe347bef0f933 2009-10-23T10:47:28-07:00 2009-10-23T10:47:28-07:00 add 'hello world' card creation benchmarks ae139d9d8746c8f632586274de52ae3334294238 Lewis Hoffman lewis@grasscommons.org e0cdfc35b59ba3bbcfe88c35701d78ccbb847cb8 Ethan McCutchen ethan@cutch.(none) http://github.com/wagn/wagn/commit/0288bbb10113e7c1ee0b8c4a140675afe96e0865 0288bbb10113e7c1ee0b8c4a140675afe96e0865 2009-10-23T09:08:01-07:00 2009-10-23T09:08:01-07:00 fixed forgot password typo 1c0970dbac136d1caf31f596942a596fc5629d45 Ethan McCutchen ethan@cutch.(none)