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 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 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 bf60738a023764d78cdc66d4048ba2327f4116d6 c3 courtenay@entp.com http://github.com/entp/xtt/commit/154a3bee6dee49d18688049c6a8e4b460d04a26d 154a3bee6dee49d18688049c6a8e4b460d04a26d

2009-06-11T10:46:51-07:00

Fix bad merge 391c9c42d0fbeb60a680e5f2074834f754921e5e c3 courtenay@entp.com 0af04059fe6319c5437df68a3b046d95eb061ead c3 courtenay@entp.com http://github.com/entp/xtt/commit/bf60738a023764d78cdc66d4048ba2327f4116d6 bf60738a023764d78cdc66d4048ba2327f4116d6

2009-06-11T10:45:54-07:00

Bad merge (again) 79065eb6b0d0e1015b7bd4973daa21cb449baf9a c3 courtenay@entp.com 119d5c4fe434b56c83e5c0e3e938534c02b1bed5 c3 courtenay@entp.com http://github.com/entp/xtt/commit/0af04059fe6319c5437df68a3b046d95eb061ead 0af04059fe6319c5437df68a3b046d95eb061ead

2009-06-11T10:45:27-07:00

Fix bad merge 391c9c42d0fbeb60a680e5f2074834f754921e5e c3 courtenay@entp.com a64c0df27b423f67ef82b5705fe26c451bbc5f27 c3 courtenay@entp.com http://github.com/entp/xtt/commit/119d5c4fe434b56c83e5c0e3e938534c02b1bed5 119d5c4fe434b56c83e5c0e3e938534c02b1bed5

2009-06-11T10:45:11-07:00

bad merge intentional 79065eb6b0d0e1015b7bd4973daa21cb449baf9a c3 courtenay@entp.com 9d563c07293124697f9c84e9a1d41032f088a796 c3 courtenay@entp.com http://github.com/entp/xtt/commit/a64c0df27b423f67ef82b5705fe26c451bbc5f27 a64c0df27b423f67ef82b5705fe26c451bbc5f27

2009-06-11T10:44:04-07:00

update schema 391c9c42d0fbeb60a680e5f2074834f754921e5e c3 courtenay@entp.com 2a55f46c77035bee03cbc83dc0b782aa9ebd9a89 c3 courtenay@entp.com http://github.com/entp/xtt/commit/9d563c07293124697f9c84e9a1d41032f088a796 9d563c07293124697f9c84e9a1d41032f088a796

2009-06-11T10:43:43-07:00

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

Add some gemspecs bdbc364c8aa85ee8a8c17f805463ae9bd9bde622 c3 courtenay@entp.com 2a76f26aa203a135519951a224f0d46011cbb30a c3 courtenay@entp.com http://github.com/entp/xtt/commit/2a55f46c77035bee03cbc83dc0b782aa9ebd9a89 2a55f46c77035bee03cbc83dc0b782aa9ebd9a89

2009-06-11T10:41:23-07:00

Upgrade acts_as_state_machine to aasm and patch a few things to make it work bc578524102915dde4ccf0c71a01207356f62acf c3 courtenay@entp.com 5fd63a2d4b54c23aa631ab188c9308c35d462ae6 c3 courtenay@entp.com http://github.com/entp/xtt/commit/2a76f26aa203a135519951a224f0d46011cbb30a 2a76f26aa203a135519951a224f0d46011cbb30a

2009-06-11T10:23:47-07:00

install aasm plugin 9d8d2e3abd9e03e7e7a2cee983f8239692796236 c3 courtenay@entp.com f757f88cb1a7a12b175b447783bf692493fbc799 Court3nay courtenay@caboo.se http://github.com/entp/xtt/commit/14c1c108592a8b85fab60993ceba1ac96d9865c7 14c1c108592a8b85fab60993ceba1ac96d9865c7

2009-05-22T18:49:27-07:00

2009-05-22T18:48:20-07:00

Complete upgrade of AASM and fix a bad merge / bad local stuff half-finished 3033c0fea0b3f8ff986e72872228629282a5e08c Court3nay courtenay@caboo.se ac6e646cc660fc25a0a5ff257d2bf9dc8df98a4e 91ca3d433dea47ccea38f28cdcabd6ec05036f77 Court3nay courtenay@caboo.se http://github.com/entp/xtt/commit/f757f88cb1a7a12b175b447783bf692493fbc799 f757f88cb1a7a12b175b447783bf692493fbc799

2009-05-22T18:41:35-07:00

Merge branch 'master' of git@entp.com:tt Conflicts: lib/aimbo.rb 4c385753834c0aaf54a6a291cf9cdbf7bdc29ca3 Court3nay courtenay@caboo.se a5aa5d23fc79695fa4d90b836bc2818296baaad8 Court3nay courtenay@caboo.se http://github.com/entp/xtt/commit/ac6e646cc660fc25a0a5ff257d2bf9dc8df98a4e ac6e646cc660fc25a0a5ff257d2bf9dc8df98a4e

2009-05-22T18:41:03-07:00

Update for newer cap a17bef2bdb65f3ee7a74e5200df6cc0a9a21cacb Court3nay courtenay@caboo.se e0b71fa96dcb1f45d22498f1450507aecf442ccf 5fd63a2d4b54c23aa631ab188c9308c35d462ae6 Court3nay courtenay@caboo.se http://github.com/entp/xtt/commit/a5aa5d23fc79695fa4d90b836bc2818296baaad8 a5aa5d23fc79695fa4d90b836bc2818296baaad8

2009-05-22T18:39:39-07:00

Merge commit 'github/master' Conflicts: .gitignore app/controllers/contexts_controller.rb app/controllers/projects_controller.rb app/models/status/filtering.rb app/views/statuses/_chart.html.erb config/environment.rb 3c08006f517d8265582bbeab60c25d4da0fbfb1c Court3nay courtenay@caboo.se b70fe5650ac2125b72f249c8c685200db1106848 Court3nay courtenay@caboo.se http://github.com/entp/xtt/commit/5fd63a2d4b54c23aa631ab188c9308c35d462ae6 5fd63a2d4b54c23aa631ab188c9308c35d462ae6

2009-05-19T19:43:44-07:00

For some reason spec is requiring this file and connecting. d4cee6a97643a0f43309330286bf738831905f4a Court3nay courtenay@caboo.se cc418f09a86663bb234f6c21b77a279de315e88e Court3nay courtenay@caboo.se http://github.com/entp/xtt/commit/b70fe5650ac2125b72f249c8c685200db1106848 b70fe5650ac2125b72f249c8c685200db1106848

2009-05-19T19:43:13-07:00

Now with rails 2.2 - heh - this is the latest version of rails that xtt will run on, due to model_stubbing f0ea8290b38549e360435c37b8b462873d01ce9f Court3nay courtenay@caboo.se 7cf010a075e5703eca2965b4e46ab333775bd039 cc418f09a86663bb234f6c21b77a279de315e88e c3 courtenay@entp.com http://github.com/entp/xtt/commit/91ca3d433dea47ccea38f28cdcabd6ec05036f77 91ca3d433dea47ccea38f28cdcabd6ec05036f77

2009-05-15T14:22:07-07:00

Merge branch 'entp_master' 489d3d172a3e59f172e728cb6abbe40fb6bf14ea c3 courtenay@entp.com 0d2f6a4722aea91ffd74a8988cd4a4a1f0a4d446 c3 courtenay@entp.com http://github.com/entp/xtt/commit/cc418f09a86663bb234f6c21b77a279de315e88e cc418f09a86663bb234f6c21b77a279de315e88e

2009-05-15T14:21:43-07:00

Remove some rails deprec warnings eb6a98c57e113897b7f05567f86e16a76cc03b1e c3 courtenay@entp.com 541e83c274ca852a30ba33139ffb3c8e98d5faad c3 courtenay@entp.com http://github.com/entp/xtt/commit/0d2f6a4722aea91ffd74a8988cd4a4a1f0a4d446 0d2f6a4722aea91ffd74a8988cd4a4a1f0a4d446

2009-05-15T14:19:05-07:00

Final spec cleaning 5041c7b4e0d684fe4a938b84bda7ecaada27775f c3 courtenay@entp.com ef651b27ae78711be4cff2e129d8a3c34ca82958 c3 courtenay@entp.com http://github.com/entp/xtt/commit/541e83c274ca852a30ba33139ffb3c8e98d5faad 541e83c274ca852a30ba33139ffb3c8e98d5faad

2009-05-15T14:16:49-07:00

Cleanup tendril spec 049d1e31bf8b9a28cc1e33c7cf3e4f39571cf986 c3 courtenay@entp.com 2593ab2c1559cd8413220507aa511679d317a464 c3 courtenay@entp.com http://github.com/entp/xtt/commit/ef651b27ae78711be4cff2e129d8a3c34ca82958 ef651b27ae78711be4cff2e129d8a3c34ca82958

2009-05-15T14:05:59-07:00

Work around some rspec upgrade issues ddafd8c437b7a0fc4952f644de213622197f4f4c c3 courtenay@entp.com