c58186451f6f6ec1116cfac3c131ba3ae5dc88ea Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/ce1c09217327e82c06ef5dc456c2a700258f18e6 ce1c09217327e82c06ef5dc456c2a700258f18e6

2008-06-24T11:35:30-07:00

merge upstream 59f817d19cd3c143398471b69b515e05a09bfa8f Reinier Balt lrbalt@gmail.com ef2ea8f3e45041b0524afd4b306345001acee31e adde38eecba66e627dddee9574f9ceecc4f2dd7d Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/c58186451f6f6ec1116cfac3c131ba3ae5dc88ea c58186451f6f6ec1116cfac3c131ba3ae5dc88ea

2008-06-23T11:59:31-07:00

Merge branch 'master' of git://github.com/bsag/tracks 04f593eced1af9e7dfe85917b56f9a0a15287b96 Reinier Balt lrbalt@gmail.com 6f760c768e800714926e284dd955e2990bb60267 Luke Melia luke@lukemelia.com http://github.com/bsag/tracks/commit/adde38eecba66e627dddee9574f9ceecc4f2dd7d adde38eecba66e627dddee9574f9ceecc4f2dd7d

2008-06-22T21:36:05-07:00

Move over another ajax test from selenium to stories. 99728a7f5044617a554912a0c7ce7fc3ec165f7e Luke Melia luke@lukemelia.com 6e0999bd062c7e74a5a2594a4c06cb0ae176c112 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/6f760c768e800714926e284dd955e2990bb60267 6f760c768e800714926e284dd955e2990bb60267

2008-06-22T07:30:38-07:00

Context model specs completed. Using fixtures for some examples currently, but might convert to mocks in future. Specs now offer same coverage as Test::Unit tests for Context model. 061fb3d499748c4d3f1731f652658a97104ea0e1 bsag butshesagirl@rousette.org.uk a095f8cb0ede6ae37ae5a2c56e9367885c48b35a 6e0999bd062c7e74a5a2594a4c06cb0ae176c112 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/ef2ea8f3e45041b0524afd4b306345001acee31e ef2ea8f3e45041b0524afd4b306345001acee31e

2008-06-22T01:46:26-07:00

Merge branch 'master' of git://github.com/bsag/tracks df2113d8b097bc82d3e38ddd75fe8c0b93733a6d Reinier Balt lrbalt@gmail.com 7ef4c96b1e8db54e77434498ecbab43ec9b73580 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/6e0999bd062c7e74a5a2594a4c06cb0ae176c112 6e0999bd062c7e74a5a2594a4c06cb0ae176c112

2008-06-21T06:28:01-07:00

Initial work on specs for models - Context model spec started. dbd4d30cd9e0a4c981215f2dbb36c39e93042077 bsag butshesagirl@rousette.org.uk 91f31d8af32b8fa8ac46d614aadfba5339b363b1 4139a6bc82dea2e2c48464a74823180c04733db6 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/7ef4c96b1e8db54e77434498ecbab43ec9b73580 7ef4c96b1e8db54e77434498ecbab43ec9b73580

2008-06-21T03:00:43-07:00

Merge branch 'master' of git@github.com:bsag/tracks * 'master' of git@github.com:bsag/tracks: changes api description to follow solution in #738 3c146e8c29dbaad99fb87d08b04f16c507ed97fb bsag butshesagirl@rousette.org.uk 12d3b8eeee6a98da20eee74c5cb1859b0b5cda45 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/4139a6bc82dea2e2c48464a74823180c04733db6 4139a6bc82dea2e2c48464a74823180c04733db6

2008-06-19T23:37:31-07:00

changes api description to follow solution in #738 6e46e0b833c4053a2cec32642c39eb3e3c6dafb1 Reinier Balt lrbalt@gmail.com 7b432a74ed1e46b8d8429d98356a207a7c1a2d8c 12d3b8eeee6a98da20eee74c5cb1859b0b5cda45 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/91f31d8af32b8fa8ac46d614aadfba5339b363b1 91f31d8af32b8fa8ac46d614aadfba5339b363b1

2008-06-19T10:51:31-07:00

Merge branch 'master' of git@github.com:bsag/tracks * 'master' of git@github.com:bsag/tracks: update version information. Started moving selenium on rails tests over to RSpec stories. See the updated README_DEVELOPERS for info on running the new tests. Removed SimplyHelpful plugin (functionality has been rolled into Rails) and modified ResourceFeeder as necessary. Added Rspec and Webrat plugins and started porting Selenium on Rails tests to Rspec Plain Text Stories driving Webrat driving Selenium. b5cc666d87d78613b053876075a05e7b3850da7a bsag butshesagirl@rousette.org.uk 4e890524f03ce735bf4f9adfaeb6bdc8078aaffb Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/a095f8cb0ede6ae37ae5a2c56e9367885c48b35a a095f8cb0ede6ae37ae5a2c56e9367885c48b35a

2008-06-19T01:13:59-07:00

merge upstream changes da2808e98b13ed66b2c1bbd7ca9bdfd47be045ae Reinier Balt lrbalt@gmail.com 79775b1483fef43fd6f845633a109792d2ece37d 12d3b8eeee6a98da20eee74c5cb1859b0b5cda45 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/4e890524f03ce735bf4f9adfaeb6bdc8078aaffb 4e890524f03ce735bf4f9adfaeb6bdc8078aaffb

2008-06-19T01:13:14-07:00

Merge branch 'master' of git://github.com/bsag/tracks 10dc4627bced30331905a2d61f3379b13fc50023 Reinier Balt lrbalt@gmail.com d47e863dfc87e995faec9bb96397ceecda24585a Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/12d3b8eeee6a98da20eee74c5cb1859b0b5cda45 12d3b8eeee6a98da20eee74c5cb1859b0b5cda45

2008-06-18T23:50:11-07:00

update version information. Small change to see if I can push to the main repository 64b90e9bf546dbb0713de0d6f902a3250ab83f98 Reinier Balt lrbalt@gmail.com 85dc6f48987024b9421dd9db346c87ae1878f782 Luke Melia luke@lukemelia.com http://github.com/bsag/tracks/commit/d47e863dfc87e995faec9bb96397ceecda24585a d47e863dfc87e995faec9bb96397ceecda24585a

2008-06-18T21:14:04-07:00

Started moving selenium on rails tests over to RSpec stories. See the updated README_DEVELOPERS for info on running the new tests. 607607b42bb3bfdbae4db01be04e081d363def6c Luke Melia luke@lukemelia.com 0f7d6f7a1dc2ae2775a8a41378ad402ab1ed10f6 Luke Melia luke@lukemelia.com http://github.com/bsag/tracks/commit/85dc6f48987024b9421dd9db346c87ae1878f782 85dc6f48987024b9421dd9db346c87ae1878f782

2008-06-18T13:13:37-07:00

Removed SimplyHelpful plugin (functionality has been rolled into Rails) and modified ResourceFeeder as necessary. 5f1acc93b532bbb0c8b8c945722858739992de90 Luke Melia luke@lukemelia.com 0600756bbf8ab3f3654cbb0e6bcbf9ea03068918 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/7b432a74ed1e46b8d8429d98356a207a7c1a2d8c 7b432a74ed1e46b8d8429d98356a207a7c1a2d8c

2008-06-18T05:31:16-07:00

Schema update after Rails 2.1 update 77fdb2c3b97efa842ec29b90845287b8bfc33d3d bsag butshesagirl@rousette.org.uk 952a73e39d692a74db429c5065127cb59fd951c4 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/79775b1483fef43fd6f845633a109792d2ece37d 79775b1483fef43fd6f845633a109792d2ece37d

2008-06-18T01:33:06-07:00

fixes routes.rb c4cae3ff55a347c2ff6aa8fdd9f5b20dfebf556c Reinier Balt lrbalt@gmail.com 7098afb8d367648b7b7890e9b0e018d346476ee3 0600756bbf8ab3f3654cbb0e6bcbf9ea03068918 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/952a73e39d692a74db429c5065127cb59fd951c4 952a73e39d692a74db429c5065127cb59fd951c4

2008-06-18T01:13:56-07:00

Merge branch 'master' of git://github.com/bsag/tracks Conflicts: config/routes.rb 3ce3c30fd3430f6d5fbdb75482c68d72d10d634a Reinier Balt lrbalt@gmail.com 0600756bbf8ab3f3654cbb0e6bcbf9ea03068918 Luke Melia luke@lukemelia.com http://github.com/bsag/tracks/commit/0f7d6f7a1dc2ae2775a8a41378ad402ab1ed10f6 0f7d6f7a1dc2ae2775a8a41378ad402ab1ed10f6

2008-06-17T23:57:57-07:00

Added Rspec and Webrat plugins and started porting Selenium on Rails tests to Rspec Plain Text Stories driving Webrat driving Selenium. b842030e1de5fe2281a1d87905b143f219779b4d Luke Melia luke@lukemelia.com 901a58f8a311f247d2f63f946e92cfe01b653c78 Luke Melia luke@lukemelia.com http://github.com/bsag/tracks/commit/0600756bbf8ab3f3654cbb0e6bcbf9ea03068918 0600756bbf8ab3f3654cbb0e6bcbf9ea03068918

2008-06-17T09:35:36-07:00

Added missing fixture to context API integration test. Previously caused a failure when run in isolation. 0f31802a865aae403b87b5ec7170325683aa5b70 Luke Melia luke@lukemelia.com f3bae7386874441bfd00cc2d5d20329aa1c6ab8d Luke Melia luke@lukemelia.com http://github.com/bsag/tracks/commit/901a58f8a311f247d2f63f946e92cfe01b653c78 901a58f8a311f247d2f63f946e92cfe01b653c78

2008-06-16T22:13:25-07:00

Upgraded to Rails 2.1. This can have wide ranging consequences, so please help track down any issues introduced by the upgrade. Requires environment.rb modifications. Changes you will need to make: * In your environment.rb, you will need to update references to a few files per environment.rb.tmpl * In your environment.rb, you will need to specify the local time zone of the computer that is running your Tracks install. Other notes on my changes: * Modified our code to take advantage of Rails 2.1's slick time zone support. * Upgraded will_paginate for compatibility * Hacked the Selenium on Rails plugin, which has not been updated in some time and does not support Rails 2.1 * Verified that all tests pass on my machine, including Selenium tests -- I'd like confirmation from others, too. 642bb7afc616fdd20d4feb8e1a363e5cdc6d6414 Luke Melia luke@lukemelia.com d3649e6b2535b1573ba81b45a99e788953f15d0d bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/f3bae7386874441bfd00cc2d5d20329aa1c6ab8d f3bae7386874441bfd00cc2d5d20329aa1c6ab8d

2008-06-16T10:27:07-07:00

Added TextMate *.tmproj files to .gitignore e1053c4375e9196c1f14feec32e1f94ab00e65fc bsag butshesagirl@rousette.org.uk c8d7466ca59aae956f53b433396a92c82247abf5 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/d3649e6b2535b1573ba81b45a99e788953f15d0d d3649e6b2535b1573ba81b45a99e788953f15d0d

2008-06-16T10:24:54-07:00

Updated docs with the instructions for getting development versions from git. 8fc9dbeb6d4b32c939ade69e80a06dd1b01a4c2f bsag butshesagirl@rousette.org.uk c8d7466ca59aae956f53b433396a92c82247abf5 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/7098afb8d367648b7b7890e9b0e018d346476ee3 7098afb8d367648b7b7890e9b0e018d346476ee3

2008-06-16T07:13:33-07:00

routes update? c0fce0cc5b28bcec7fed5e5e30696f83718d58cc Reinier Balt lrbalt@gmail.com 8a3ba65bb7664162279d8ccdfe7c123a1b0f9c10 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/c8d7466ca59aae956f53b433396a92c82247abf5 c8d7466ca59aae956f53b433396a92c82247abf5

2008-06-16T07:04:59-07:00

ignore proejct files from netbeans 91073a6f7a0aa7c213c6aa18a277431b6e1854d7 Reinier Balt lrbalt@gmail.com 12b2c06b71cf7d0b9298ee9a8b801da5130a13c9 Reinier Balt lrbalt@gmail.com http://github.com/bsag/tracks/commit/8a3ba65bb7664162279d8ccdfe7c123a1b0f9c10 8a3ba65bb7664162279d8ccdfe7c123a1b0f9c10

2008-06-16T06:24:02-07:00

somehow these files have been marked a changed after the pull c83598b3a98484570bc1e88001b7df6922394e89 Reinier Balt lrbalt@gmail.com 1b00a314ae510c15e93ba7fde12c92f43d33559c bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/12b2c06b71cf7d0b9298ee9a8b801da5130a13c9 12b2c06b71cf7d0b9298ee9a8b801da5130a13c9

2008-06-15T02:43:48-07:00

Added line to .gitignore to ignore db/*.sqlite3 files. I suggest that users use the .sqlite3 suffix for their databases, and reserve .db for the example databases. 66bd08314964073f097b0eb153926ae1dbd3b580 bsag butshesagirl@rousette.org.uk c1109b3fb33a9c013fb97d2d04ecee4003d23554 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/1b00a314ae510c15e93ba7fde12c92f43d33559c 1b00a314ae510c15e93ba7fde12c92f43d33559c

2008-06-15T02:38:58-07:00

Added patch by Eric to fix users_controller_test. Fixes #735. <http://dev.rousette.org.uk/ticket/735> a65c2ca5f8e81a1bc70477d7ad994c86d64d4762 bsag butshesagirl@rousette.org.uk 73c16270917c94448ebd0d91ba0da612687856db 0380d1b15ae88a71c90ea94c58afc2dfbb374153 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/c1109b3fb33a9c013fb97d2d04ecee4003d23554 c1109b3fb33a9c013fb97d2d04ecee4003d23554

2008-06-15T01:59:22-07:00

Merge branch 'svn-tracking' Up to r881 of svn repository * svn-tracking: (22 commits) Added .gitconfig Added yaml_db plugin: http://opensource.heroku.com/ applied patch from Eric from #732 fixes #730 restores ability to delete user from user management page fixes #724 where editing todos truncates the project name of the todo when the project name contains quotes (") Applied patch from Eric Pallen whcih automatically converts url's to links. Thanks Eric! explain that yaml cannot yet be used for backup as importing is not implemented yet. from mailinglist. hopefully fixes #727.Changes the check on running animation to finished animation regenerate compressed js and cleanup whitespace turns out that getElementsByClassName is removed from prototype and it therfore falls back to the function of the browser which has different semantics. Found here http://www.prototypejs.org/api/utility/getElementsByClassName forgot to create a new compressed js from the previous js changes in the stats page you can downdrill to see the active todos in a certain week from the running time charts. This patch adds the option to see all active todos from the selected week and older. fix #727. Adds a check to prevent expand/collapse while a previous expand/collaps is still animating fixed small problem where updating a todo from mobile resulted in an error becase source_view was nil fixes #726. Thanks Eric Pallen for the fix. The mobile view showed active todos from completed projects while the home page does not. merges changes from tracks1.6 to trunk prepares trunk for 1.6 release fixes #713. Adds behavior for edit/star/delete/check buttons of todo even if there is no todo to show. This makes sure that the behaviors are present when you add a new todo through AJAX. fixes #718. The link included the number of actions which resulted from last commit removed some more whitespace to reduce the download of the mobile view. ... be978cb6af736182780dd2a01a406b80cdbfc35d bsag butshesagirl@rousette.org.uk 27eeb9a1fcb7598b316302ee4619b88bfc7c6c37 010417b60cc75448a04d3e657a7224a9a75af967 bsag butshesagirl@rousette.org.uk http://github.com/bsag/tracks/commit/0380d1b15ae88a71c90ea94c58afc2dfbb374153 0380d1b15ae88a71c90ea94c58afc2dfbb374153

2008-06-15T01:50:05-07:00

Merge branch 'master' of /Users/jackie/Sites/tracks_svn into svn-tracking Up to r881 * 'master' of /Users/jackie/Sites/tracks_svn: (22 commits) Added .gitconfig Added yaml_db plugin: http://opensource.heroku.com/ applied patch from Eric from #732 fixes #730 restores ability to delete user from user management page fixes #724 where editing todos truncates the project name of the todo when the project name contains quotes (") Applied patch from Eric Pallen whcih automatically converts url's to links. Thanks Eric! explain that yaml cannot yet be used for backup as importing is not implemented yet. from mailinglist. hopefully fixes #727.Changes the check on running animation to finished animation regenerate compressed js and cleanup whitespace turns out that getElementsByClassName is removed from prototype and it therfore falls back to the function of the browser which has different semantics. Found here http://www.prototypejs.org/api/utility/getElementsByClassName forgot to create a new compressed js from the previous js changes in the stats page you can downdrill to see the active todos in a certain week from the running time charts. This patch adds the option to see all active todos from the selected week and older. fix #727. Adds a check to prevent expand/collapse while a previous expand/collaps is still animating fixed small problem where updating a todo from mobile resulted in an error becase source_view was nil fixes #726. Thanks Eric Pallen for the fix. The mobile view showed active todos from completed projects while the home page does not. merges changes from tracks1.6 to trunk prepares trunk for 1.6 release fixes #713. Adds behavior for edit/star/delete/check buttons of todo even if there is no todo to show. This makes sure that the behaviors are present when you add a new todo through AJAX. fixes #718. The link included the number of actions which resulted from last commit removed some more whitespace to reduce the download of the mobile view. ... c64911bc4462995d1874b7b0b7a4e502c161b7f7 bsag butshesagirl@rousette.org.uk 3cd8093014a14093b9b9aadf1c6bdcbcae3f0b21 bsag bsag@a4c988fc-2ded-0310-b66e-134b36920a42 http://github.com/bsag/tracks/commit/010417b60cc75448a04d3e657a7224a9a75af967 010417b60cc75448a04d3e657a7224a9a75af967

2008-06-14T10:07:24-07:00

Added .gitconfig git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@881 a4c988fc-2ded-0310-b66e-134b36920a42 54ebd5cb3a82b7309f301855fde06501681af6bc bsag bsag@a4c988fc-2ded-0310-b66e-134b36920a42