ba91951ec90cd4ece6934cc77152a4001d2895fc Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/0b06e6f221a2c20bff8eb79bc602e43c02327a38 0b06e6f221a2c20bff8eb79bc602e43c02327a38 2009-04-11T20:32:53-07:00 2009-04-11T20:32:53-07:00 Include environment in git. We need a better way to separate local changes from those thing which should be controlled within the repository. 176c3708fafb327080388a8bfbbf0fa918ec1815 Aristedes Maniatis ari@ish.com.au f1a1d7710787e2f378f489a0824410b254a509fa Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/ba91951ec90cd4ece6934cc77152a4001d2895fc ba91951ec90cd4ece6934cc77152a4001d2895fc 2009-04-09T03:02:58-07:00 2009-04-09T03:02:58-07:00 Remove rails from the package. 068f1e47352799c8a20f88fe2e9ce1115ab30e20 Aristedes Maniatis ari@ish.com.au bda26057c93bc76a0e4853b957d6ac4a97b64f90 Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/f1a1d7710787e2f378f489a0824410b254a509fa f1a1d7710787e2f378f489a0824410b254a509fa 2009-04-06T05:14:54-07:00 2009-04-06T05:14:54-07:00 Remove all gems installed in Clocking IT. They are best installed at the system level to save 17Mb of download. f1aadc470d1944265ff6d00ad5fcf946544dafab Aristedes Maniatis ari@ish.com.au 9bc75ca8f223ad4a79b5d1f79b9e19667c5c5c74 Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/bda26057c93bc76a0e4853b957d6ac4a97b64f90 bda26057c93bc76a0e4853b957d6ac4a97b64f90 2009-04-06T04:11:48-07:00 2009-04-06T04:11:48-07:00 Add fastercsv as an embedded gem. 9a7023e2752821a65c06a8d2b19708e3ef3ecfa2 Aristedes Maniatis ari@ish.com.au 6707cab36b0f6be6c404d13ec3e495cca4c9d01c Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/9bc75ca8f223ad4a79b5d1f79b9e19667c5c5c74 9bc75ca8f223ad4a79b5d1f79b9e19667c5c5c74 2009-04-06T04:03:44-07:00 2009-04-06T04:03:44-07:00 Revert mistaken change to Juggernaut (we should not upgrade that plugin.) 3b73b16df0340fe4fb675de22447374869db24de Aristedes Maniatis ari@ish.com.au b2e91c1f0f4183150b9432f00c86a89d4c956ffa e6f03a6b55409afbba7228d2c10825c462547bea Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/6707cab36b0f6be6c404d13ec3e495cca4c9d01c 6707cab36b0f6be6c404d13ec3e495cca4c9d01c 2009-04-06T04:00:40-07:00 2009-04-06T04:00:40-07:00 Merge branch 'master' of git://github.com/Fudge/clockingit into rails23 be2bfbaffae809776954ba3d2879bb4df50c806b Aristedes Maniatis ari@ish.com.au 93b0844f843035ab3c9895486e454e21fdbf078d a62a8054d3365c2843c42acb115242943c15d36f Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/b2e91c1f0f4183150b9432f00c86a89d4c956ffa b2e91c1f0f4183150b9432f00c86a89d4c956ffa 2009-04-06T04:00:20-07:00 2009-04-06T04:00:20-07:00 Merge branch 'master' of git://github.com/bradx3/clockingit into rails23 edcfb4928c716325783724c7ce00c1e7e8775f72 Aristedes Maniatis ari@ish.com.au 9a0d5c7b96d9f162fb2e8c166a1bf0c46bb5d5cd Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/93b0844f843035ab3c9895486e454e21fdbf078d 93b0844f843035ab3c9895486e454e21fdbf078d 2009-04-06T03:59:43-07:00 2009-04-06T03:59:43-07:00 Continuation of upgrade to Rails 2.3 4ec7b16f288336584312b89ac4c1b73067df117a Aristedes Maniatis ari@ish.com.au 5a4d8903543db17d5c745a3c67f6f5f6fdb22d7a Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/9a0d5c7b96d9f162fb2e8c166a1bf0c46bb5d5cd 9a0d5c7b96d9f162fb2e8c166a1bf0c46bb5d5cd 2009-04-06T03:58:12-07:00 2009-04-06T03:58:12-07:00 Upgrade to Rails 2.3 52f7fe66344a53021952d74d88f5f140cb4c38e4 Aristedes Maniatis ari@ish.com.au 09280480d0fbf990ec527847c606ed96bc62deeb Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/e6f03a6b55409afbba7228d2c10825c462547bea e6f03a6b55409afbba7228d2c10825c462547bea 2009-04-05T03:47:12-07:00 2009-04-05T03:46:57-07:00 Fix duration == nil f23f904b654ac2c2880ff26c6d02337afabd42bc Erlend Simonsen admin@clockingit.com 36c85bc879a0dd7a4100a8c5ff00d1abfd824ad5 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/09280480d0fbf990ec527847c606ed96bc62deeb 09280480d0fbf990ec527847c606ed96bc62deeb 2009-04-05T03:45:52-07:00 2009-04-05T03:45:52-07:00 Escape HTML in Post bodies shown in activities Conflicts: app/views/activities/_other_row.rhtml ffd5d9f45323b1f8e8c838aa596089b8d2106e20 Erlend Simonsen admin@clockingit.com f0fdcd3365d875a2ea0a29572694dba70ef2ea60 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/36c85bc879a0dd7a4100a8c5ff00d1abfd824ad5 36c85bc879a0dd7a4100a8c5ff00d1abfd824ad5 2009-04-05T03:43:22-07:00 2009-04-05T03:43:03-07:00 Fix duration == nil c5bfab2b4b0f64f8bf7aa50f2d78f8e0212b79af Erlend Simonsen admin@clockingit.com 9050c2a64f01120cec311da3b5627a2d3ccb8a70 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/f0fdcd3365d875a2ea0a29572694dba70ef2ea60 f0fdcd3365d875a2ea0a29572694dba70ef2ea60 2009-04-05T03:42:05-07:00 2009-04-05T03:41:05-07:00 Make sure user count check works for nil entries 84bcb344253895b6dc8a12d775539f3af62a856a Erlend Simonsen admin@clockingit.com 711564be98a2597fe769d1f3200512b509c18461 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/9050c2a64f01120cec311da3b5627a2d3ccb8a70 9050c2a64f01120cec311da3b5627a2d3ccb8a70 2009-04-05T02:18:48-07:00 2009-04-05T02:16:44-07:00 Edit todo items - Create todo item sortable on display of container - Escape html in todo names - Edit / Cancel Editing of todo item c3578850b005923c3b40d6c8fbb9a92ec17ebd9d Erlend Simonsen admin@clockingit.com f655306350536ad1aecdbad98d26b7984860c2ce Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/711564be98a2597fe769d1f3200512b509c18461 711564be98a2597fe769d1f3200512b509c18461 2009-04-05T01:12:18-07:00 2009-04-05T01:12:18-07:00 Add basic class to fieldsets to align labels/inputs b903561eca65ced715cd0888e6ffa83900387995 Erlend Simonsen admin@clockingit.com 015ca61f03254aded2b6b111e5c23c18b9d33baf Brad Wilson brad@lucky-dip.net http://github.com/ari/clockingit/commit/a62a8054d3365c2843c42acb115242943c15d36f a62a8054d3365c2843c42acb115242943c15d36f 2009-04-04T16:32:03-07:00 2009-04-04T16:32:03-07:00 renamed search.rb ff52d8d3111e41898621933fd650e5650e2e0a0b Brad Wilson brad@lucky-dip.net 17cbfb263ada8749b66e9540cd2ee0977640e5c2 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/f655306350536ad1aecdbad98d26b7984860c2ce f655306350536ad1aecdbad98d26b7984860c2ce 2009-04-04T10:38:24-07:00 2009-04-04T10:38:24-07:00 Give fieldsets basic class e12279776e447c8dfa5a6d2c86b95f7ff35f10fd Erlend Simonsen admin@clockingit.com 28455612c937b21f56314a95f6625a68e2b8cacf Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/17cbfb263ada8749b66e9540cd2ee0977640e5c2 17cbfb263ada8749b66e9540cd2ee0977640e5c2 2009-04-04T10:30:31-07:00 2009-04-04T10:30:31-07:00 Fix page-header links ending up below the header c2624aa832ecb5ea2a135c8e0faa21b7128c913d Erlend Simonsen admin@clockingit.com c7ef22034024a3062b0f6505c017e3ae979eeeb3 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/28455612c937b21f56314a95f6625a68e2b8cacf 28455612c937b21f56314a95f6625a68e2b8cacf 2009-04-04T09:55:06-07:00 2009-04-04T09:55:06-07:00 Remove delete-cross when removing watcher fe6dfad7080f2212cd63167f026c33add07b335c Erlend Simonsen admin@clockingit.com 19ccb62349611cc4db610efd61afcbd6874d57fd 292218ad4534c18161fe86d336ade82bee3f6bee Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/c7ef22034024a3062b0f6505c017e3ae979eeeb3 c7ef22034024a3062b0f6505c017e3ae979eeeb3 2009-04-04T09:31:49-07:00 2009-04-04T09:31:49-07:00 Merge branch 'master' into dev Conflicts: app/controllers/schedule_controller.rb app/views/layouts/application.rhtml 651d336d1679022fe2b8c3201259b2fdd0053ce3 Erlend Simonsen admin@clockingit.com 5e9a4f986a0862bc7f2e46e9e714a42fe9d05de3 5a4d8903543db17d5c745a3c67f6f5f6fdb22d7a Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/19ccb62349611cc4db610efd61afcbd6874d57fd 19ccb62349611cc4db610efd61afcbd6874d57fd 2009-04-04T09:28:02-07:00 2009-04-04T09:28:02-07:00 Merge commit 'ari/master' into dev a3a8c248e2b5e3c0de2b1c05d82372bd26850874 Erlend Simonsen admin@clockingit.com ac0f49f20fd9fe8ec97ed7500133e544f050e2b7 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/292218ad4534c18161fe86d336ade82bee3f6bee 292218ad4534c18161fe86d336ade82bee3f6bee 2009-04-04T09:17:03-07:00 2009-04-04T09:17:03-07:00 Remove padding override on input,textarea Fixed broken checkboxes in Opera 7c4b671d7611f4e8fb950cdb15d24cf06943c86b Erlend Simonsen admin@clockingit.com 52a455b0dc3e6229a462d5ed2eb63a41684ee205 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/5e9a4f986a0862bc7f2e46e9e714a42fe9d05de3 5e9a4f986a0862bc7f2e46e9e714a42fe9d05de3 2009-04-04T06:22:33-07:00 2009-04-04T06:22:33-07:00 Use localtime instead of UTC when dealing with end / start of month dates Conflicts: app/controllers/schedule_controller.rb db6346e79f2a54398ff416b8e3e976c6afef9bc5 Erlend Simonsen admin@clockingit.com 3be51a399b972a2eae5f339888b8bf6176c0ab49 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/ac0f49f20fd9fe8ec97ed7500133e544f050e2b7 ac0f49f20fd9fe8ec97ed7500133e544f050e2b7 2009-04-04T06:19:10-07:00 2009-04-04T06:19:10-07:00 Use localtime instead of UTC when dealing with end / start of month dates b75f0b01ce866651f6c47fc2f22e2c1304cd8874 Erlend Simonsen admin@clockingit.com 14eb42d406b7f09e4c4e7074800b882d7b75f6e1 Erlend Simonsen admin@clockingit.com http://github.com/ari/clockingit/commit/52a455b0dc3e6229a462d5ed2eb63a41684ee205 52a455b0dc3e6229a462d5ed2eb63a41684ee205 2009-04-04T06:04:02-07:00 2009-04-04T06:04:02-07:00 Updated language files d9ca89f8ea62afc7b62668a0cdc6b96ca1b5c4bd Erlend Simonsen admin@clockingit.com 5b4347893f5217bec43b4874f514e71abbf7ca1d Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/5a4d8903543db17d5c745a3c67f6f5f6fdb22d7a 5a4d8903543db17d5c745a3c67f6f5f6fdb22d7a 2009-04-04T02:54:29-07:00 2009-04-04T02:54:29-07:00 Update documentation. 4a185162a2ed3aaeac545615209f78c114a81aae Aristedes Maniatis ari@ish.com.au 648323a31e039386916dae5dfd716b21ee3462e1 Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/5b4347893f5217bec43b4874f514e71abbf7ca1d 5b4347893f5217bec43b4874f514e71abbf7ca1d 2009-04-04T02:53:28-07:00 2009-04-04T02:53:28-07:00 Update documentation. a8121195166ff5f3db79edbbb3a8682d2096c18f Aristedes Maniatis ari@ish.com.au d6b7b57d470df09c6fd8f6f046f945ffae30b0f7 c7414dc78329a9d1ef050185d839db15da632ce4 Aristedes Maniatis ari@ish.com.au http://github.com/ari/clockingit/commit/648323a31e039386916dae5dfd716b21ee3462e1 648323a31e039386916dae5dfd716b21ee3462e1 2009-04-03T19:45:44-07:00 2009-04-03T19:45:44-07:00 Merge commit 'brad/users_in_clients' 33626cdf5b88ebd38e0f47a0b8975dfc1acfe98f Aristedes Maniatis ari@ish.com.au 0b6a20016279bc3501d973a6ead1015aeb12b14f Brad Wilson brad@lucky-dip.net http://github.com/ari/clockingit/commit/c7414dc78329a9d1ef050185d839db15da632ce4 c7414dc78329a9d1ef050185d839db15da632ce4 2009-04-02T22:57:26-07:00 2009-04-02T22:57:26-07:00 hide client css by default a9911805d01938ff0e2bc2714227731ed64fd594 Brad Wilson brad@lucky-dip.net 45a0c73d705fd134e56edb75e0c2fdda4179a6de Brad Wilson brad@lucky-dip.net http://github.com/ari/clockingit/commit/0b6a20016279bc3501d973a6ead1015aeb12b14f 0b6a20016279bc3501d973a6ead1015aeb12b14f 2009-04-02T22:49:10-07:00 2009-04-02T22:49:10-07:00 clean up custom attributes a bit f1aa96cfc2a27d3ee20d225c135bbf31b6cf8ff7 Brad Wilson brad@lucky-dip.net