34066ef465bca464b648aa7c6051eb2d30f45150 4db1e8327b314b1672b38994e4a07d5bebf5a2a8 c3 courtenay@entp.com http://github.com/entp/xtt/commit/080ba598f1945a8477e9e40d101ff25b9d0d20ba 080ba598f1945a8477e9e40d101ff25b9d0d20ba

2009-12-01T14:05:55-08:00

Merge branch 'master' of git@github.com:entp/xtt Conflicts: app/helpers/statuses_helper.rb app/views/contexts/show.html.erb spec/model_stubs.rb 170daf0705ac228b3c0219769b6e305b134433b9 c3 courtenay@entp.com 5eeb1b0e813d213f1447f33b5fa40b2c12e5a6ed c3 courtenay@entp.com http://github.com/entp/xtt/commit/34066ef465bca464b648aa7c6051eb2d30f45150 34066ef465bca464b648aa7c6051eb2d30f45150

2009-12-01T14:03:14-08:00

Don't want model stubbing, rspec, or rspec-rails. use gems. ea9c93383abe40e9f5944c2c080df34766931eac c3 courtenay@entp.com 2b7d94d56aa44e99ebf6faeccda89c26147d92ce a0995bdd1617be1d051ebe96f099a052f862de42 c3 courtenay@entp.com http://github.com/entp/xtt/commit/4db1e8327b314b1672b38994e4a07d5bebf5a2a8 4db1e8327b314b1672b38994e4a07d5bebf5a2a8

2009-11-05T17:13:13-08:00

Merge branch 'master' of git@entp.com:tt c2662d7bf410fb28d3b8dc5abc01bf0b5f537d0a c3 courtenay@entp.com b7ebd658f02e7bd3b6ef09b9c6c5a25c442b43ab c3 courtenay@entp.com http://github.com/entp/xtt/commit/a0995bdd1617be1d051ebe96f099a052f862de42 a0995bdd1617be1d051ebe96f099a052f862de42

2009-11-05T17:09:35-08:00

Fix viewing hours for users 95d6df38aaf4c4ee58a0ff8f6da29dce8d3a19a0 c3 courtenay@entp.com d69ff3994e26bfe1716129cb9e1077d0ac7ec0ca c3 courtenay@entp.com http://github.com/entp/xtt/commit/5eeb1b0e813d213f1447f33b5fa40b2c12e5a6ed 5eeb1b0e813d213f1447f33b5fa40b2c12e5a6ed

2009-11-05T17:04:16-08:00

Finish renaming context to user_context 0955470e328754001f2719d200a614c4e16c7dc0 c3 courtenay@entp.com 23838c07cb73616a53e86532c1c6c01c3c0ec06c c3 courtenay@entp.com http://github.com/entp/xtt/commit/2b7d94d56aa44e99ebf6faeccda89c26147d92ce 2b7d94d56aa44e99ebf6faeccda89c26147d92ce

2009-11-05T17:00:52-08:00

Upgrade xtt timer so it shows elapsed time e49bed56a55a720eb2924a3cb5460d4848e4c677 c3 courtenay@entp.com 8f1ccf4a461eacb205c914c299b3f987987ea255 c3 courtenay@entp.com http://github.com/entp/xtt/commit/23838c07cb73616a53e86532c1c6c01c3c0ec06c 23838c07cb73616a53e86532c1c6c01c3c0ec06c

2009-11-05T16:59:31-08:00

Upgrade to latest rail! 6cb9c1f29d5b8d063fe6e540a855607c763feb49 c3 courtenay@entp.com 0d304b6cfe6faff05273ed0210cfdbdfccaaea81 c3 courtenay@entp.com http://github.com/entp/xtt/commit/8f1ccf4a461eacb205c914c299b3f987987ea255 8f1ccf4a461eacb205c914c299b3f987987ea255

2009-11-05T16:59:13-08:00

Check for previous status first (ugh) 666fcbb1a5434c6510b209e63466690fc024a353 c3 courtenay@entp.com b7ebd658f02e7bd3b6ef09b9c6c5a25c442b43ab c3 courtenay@entp.com http://github.com/entp/xtt/commit/0d304b6cfe6faff05273ed0210cfdbdfccaaea81 0d304b6cfe6faff05273ed0210cfdbdfccaaea81

2009-11-05T16:58:48-08:00

Allow [-2m] format as well as [-2] 68be74a261fe328e883d32cbc9dd220543e0a66f c3 courtenay@entp.com cf6469488a9e554e14a1bd3e1867f2cbfa8a4dd4 c3 courtenay@entp.com http://github.com/entp/xtt/commit/b7ebd658f02e7bd3b6ef09b9c6c5a25c442b43ab b7ebd658f02e7bd3b6ef09b9c6c5a25c442b43ab

2009-11-05T16:34:37-08:00

Upgrade teh rails 5dc334806cd9819a5d4a7a7e49213449a2f7ce9f c3 courtenay@entp.com 2afe45c285fb3e9e64509bbb6a49509405bd0fd4 402259ba629bb1b154127edf6bdbf49162e6985c c3 courtenay@entp.com http://github.com/entp/xtt/commit/cf6469488a9e554e14a1bd3e1867f2cbfa8a4dd4 cf6469488a9e554e14a1bd3e1867f2cbfa8a4dd4

2009-11-05T16:26:57-08:00

Merge branch 'production', minor fix on graphs Conflicts: db/schema.rb e93c0221e1e68158dc69eff309b18dd404497ca4 c3 courtenay@entp.com cf57ce7fc9ce305e003c21a0b02d75617ef15140 c3 courtenay@entp.com http://github.com/entp/xtt/commit/402259ba629bb1b154127edf6bdbf49162e6985c 402259ba629bb1b154127edf6bdbf49162e6985c

2009-11-05T16:06:35-08:00

Allow projects to be marked as inactive to clean up the interface a little b5af729b97e8380ad5fc26aea538c63dec661ee6 c3 courtenay@entp.com c5d45987ba1ed49e2e6f6fe59ae2affa84c0f8a2 c3 courtenay@entp.com http://github.com/entp/xtt/commit/d69ff3994e26bfe1716129cb9e1077d0ac7ec0ca d69ff3994e26bfe1716129cb9e1077d0ac7ec0ca

2009-10-29T12:04:03-07:00

Bump rails version 6a683eb0eece3e4dd75e84f1e5e37746c63d2541 c3 courtenay@entp.com c5f1996038c640c6401a3bce4fb93ee699058d16 c3 courtenay@entp.com http://github.com/entp/xtt/commit/c5d45987ba1ed49e2e6f6fe59ae2affa84c0f8a2 c5d45987ba1ed49e2e6f6fe59ae2affa84c0f8a2

2009-10-29T09:31:21-07:00

Add the Tender test setup - matchy, rr, context - and start replacing specs with test_units. Rename Context model to UserContext because it clashes. 4fd6280dc8ad8090d85b2776ed36000ac37a794d c3 courtenay@entp.com 2893e4f9fde9ee7861895de8a86331ff5d5bb712 c3 courtenay@entp.com http://github.com/entp/xtt/commit/c5f1996038c640c6401a3bce4fb93ee699058d16 c5f1996038c640c6401a3bce4fb93ee699058d16

2009-10-29T09:30:04-07:00

Workaround for shitty savepoint rails bullshit (copied this code from AR!) 46aa33ccbef14bbaec187e60ee65edf9871d8af6 c3 courtenay@entp.com 03018a30379f5776f02501d45c769ec34053ecde c3 courtenay@entp.com http://github.com/entp/xtt/commit/2893e4f9fde9ee7861895de8a86331ff5d5bb712 2893e4f9fde9ee7861895de8a86331ff5d5bb712

2009-10-28T19:59:50-07:00

Clean up some specs (mailer format changed; now requires date) 2c17131010420842bdff6f347971f2514827acc7 c3 courtenay@entp.com 2e8a0fc0e9f533f55c325a99367dd5988fbbc7ec c3 courtenay@entp.com http://github.com/entp/xtt/commit/03018a30379f5776f02501d45c769ec34053ecde 03018a30379f5776f02501d45c769ec34053ecde

2009-10-28T19:56:49-07:00

Upgrade rspec c8bf90608a72318a75f1a778d5d2dd89c5fab74d c3 courtenay@entp.com 1e2fb34bd49d8da1400bc5b231a2d0bc0af57044 c3 courtenay@entp.com http://github.com/entp/xtt/commit/2e8a0fc0e9f533f55c325a99367dd5988fbbc7ec 2e8a0fc0e9f533f55c325a99367dd5988fbbc7ec

2009-10-28T19:47:19-07:00

Show elapsed time on IM responses 29b929087902def3730497fd6951384ad3f90cb4 c3 courtenay@entp.com 4a2b09ba24011c51643dbd26f00b0c7f36d2df3c 9f7769baf66fddb2dcdfb30f51badfe9e539e744 c3 courtenay@entp.com http://github.com/entp/xtt/commit/1e2fb34bd49d8da1400bc5b231a2d0bc0af57044 1e2fb34bd49d8da1400bc5b231a2d0bc0af57044

2009-08-12T20:03:38-07:00

Merge branch 'master' of git@github.com:entp/xtt Conflicts: config/environment.rb lib/aimbo.rb vendor/plugins/model_stubbing/lib/model_stubbing/definition.rb vendor/plugins/model_stubbing/lib/model_stubbing/extensions.rb vendor/plugins/model_stubbing/lib/model_stubbing/stub.rb 702b503300e2a7f80332a5e5e2f417f96297000c c3 courtenay@entp.com 9b4950f52b6ccc5737b522933007bd54cfafd4b0 c3 courtenay@entp.com http://github.com/entp/xtt/commit/4a2b09ba24011c51643dbd26f00b0c7f36d2df3c 4a2b09ba24011c51643dbd26f00b0c7f36d2df3c

2009-08-12T19:55:16-07:00

We reset the session or some shit now, it's nil 0a37e6ab5a41d1cc1f790065aaaa833c35740450 c3 courtenay@entp.com a2f93b224b22e8b55137440194aa4b52651a9921 c3 courtenay@entp.com http://github.com/entp/xtt/commit/9b4950f52b6ccc5737b522933007bd54cfafd4b0 9b4950f52b6ccc5737b522933007bd54cfafd4b0

2009-08-12T19:54:55-07:00

Fix rspec-crack to work with latest rspec( ugh ) deeb3572b87d067bbad723735feb91af7370fd26 c3 courtenay@entp.com 6ebd5dd613200a8cc2aa5ceaef6765bf1d09b8fe c3 courtenay@entp.com http://github.com/entp/xtt/commit/a2f93b224b22e8b55137440194aa4b52651a9921 a2f93b224b22e8b55137440194aa4b52651a9921

2009-08-12T19:16:11-07:00

Clean unit/model tests e51fd98edea8e68e1f18248f99f8e3461e932b65 c3 courtenay@entp.com 9011e44368341c6a26e0ebea6fa2d91e78b91b29 c3 courtenay@entp.com http://github.com/entp/xtt/commit/6ebd5dd613200a8cc2aa5ceaef6765bf1d09b8fe 6ebd5dd613200a8cc2aa5ceaef6765bf1d09b8fe

2009-08-12T19:15:39-07:00

Upgrade for rails 2.3+ 99d330895ac5bb75cad14d41b53ebb2529111874 c3 courtenay@entp.com a259f85bd9daab5c17577dbd70711b02d81a4da3 c3 courtenay@entp.com http://github.com/entp/xtt/commit/9011e44368341c6a26e0ebea6fa2d91e78b91b29 9011e44368341c6a26e0ebea6fa2d91e78b91b29

2009-08-12T19:15:33-07:00

Don't require models pl 5aee56d977e8cf671dba65ced723994a5546d3d8 c3 courtenay@entp.com 7a1248b9794b7a625d28733dc02303464206bdd8 c3 courtenay@entp.com http://github.com/entp/xtt/commit/a259f85bd9daab5c17577dbd70711b02d81a4da3 a259f85bd9daab5c17577dbd70711b02d81a4da3

2009-08-12T19:15:14-07:00

Fix crappy reload bug by NOT requiring models from initializers 46128c41a70485a0c8e535a0269fb0f2870d2800 c3 courtenay@entp.com 915eafa04e3d80fa2bd1c159fdcaac4f813f7524 c3 courtenay@entp.com http://github.com/entp/xtt/commit/7a1248b9794b7a625d28733dc02303464206bdd8 7a1248b9794b7a625d28733dc02303464206bdd8

2009-08-12T15:17:36-07:00

Upgrade to rails 2.3.3 039af7d12ecb4325a2ff5717067798c977b589b6 c3 courtenay@entp.com 899957296b43205caf6895ddbe46625dd8d87033 c3 courtenay@entp.com http://github.com/entp/xtt/commit/915eafa04e3d80fa2bd1c159fdcaac4f813f7524 915eafa04e3d80fa2bd1c159fdcaac4f813f7524

2009-08-12T15:16:51-07:00

Rails changed the way group_bys return results so we have to normalize them here adb73c88931613e8f2403e132d2ba1988d2b4a0d c3 courtenay@entp.com cc418f09a86663bb234f6c21b77a279de315e88e c3 courtenay@entp.com http://github.com/entp/xtt/commit/899957296b43205caf6895ddbe46625dd8d87033 899957296b43205caf6895ddbe46625dd8d87033

2009-08-12T15:12:31-07:00

Rename app controller for rails 2.3+ 74c851fc98806366dac89b740dfbaa1c661de2b8 c3 courtenay@entp.com 9f7769baf66fddb2dcdfb30f51badfe9e539e744 rick technoweenie@gmail.com http://github.com/entp/xtt/commit/2afe45c285fb3e9e64509bbb6a49509405bd0fd4 2afe45c285fb3e9e64509bbb6a49509405bd0fd4

2009-06-12T10:10:27-07:00

fix Membership.create! spec 6a0e757098f00463db5b0c89c24500257f60accf rick technoweenie@gmail.com 14c1c108592a8b85fab60993ceba1ac96d9865c7 154a3bee6dee49d18688049c6a8e4b460d04a26d c3 courtenay@entp.com http://github.com/entp/xtt/commit/9f7769baf66fddb2dcdfb30f51badfe9e539e744 9f7769baf66fddb2dcdfb30f51badfe9e539e744

2009-06-11T10:48:35-07:00

Merge branch 'entp_master' Conflicts: db/schema.rb spec/controllers/projects_controller_spec.rb vendor/plugins/aasm/lib/persistence/active_record_persistence.rb 6ec0d48ab1517c702d7fb2c0b0ccbcecb7a1abe2 c3 courtenay@entp.com