Commit Graph

  • 99540d63b4 Add RSS feed for plantings Amy 2013-01-28 20:23:03 -05:00
  • 887d9c03f7 Specify recent version of rspec-rails Amy 2013-01-28 19:34:55 -05:00
  • 0d84f0dde1 Added recent_plantings variable Amy 2013-01-28 19:30:23 -05:00
  • 5d362a8882 made login page look like the signup page Maia Sauren 2013-01-28 22:01:07 +11:00
  • 836dcff67e Fixed the homepage so it doesn't look messy on phones. Skud 2013-01-28 21:07:03 +11:00
  • b1a912c4e0 added .DS_Store to gitignore Maia Sauren 2013-01-28 20:53:50 +11:00
  • ca4e632870 Merge pull request #97 from Skud/planting-defaults Skud 2013-01-28 01:43:11 -08:00
  • 6113be1e69 sorting gardens alphabetically, so behaviour is clearer Skud 2013-01-28 18:19:59 +11:00
  • c5547041e0 added test for remembering the right crop/garden Skud 2013-01-28 17:59:39 +11:00
  • 5c804650b6 this fixes #43277457 - reversion of crop and garden Skud 2013-01-27 23:33:30 +11:00
  • c89e8b0828 Merge pull request #96 from Skud/fix-responsive pozorvlak 2013-01-26 03:57:36 -08:00
  • 4003234e3e Fixed responsive HTML by removing duplicate JS Skud 2013-01-26 21:08:43 +11:00
  • 3fcd17533f Merge pull request #94 from pozorvlak/alphabet Skud 2013-01-25 16:02:09 -08:00
  • 5be099bb64 Remove crop-ordering code from the Plantings form. Miles Gould 2013-01-25 11:21:32 +00:00
  • dc1ab0912f Order crops case-insensitively by default. Miles Gould 2013-01-25 11:19:15 +00:00
  • 8d2fe8809d Add an uppercase crop factory. Miles Gould 2013-01-25 11:10:37 +00:00
  • 9ebbeb125d Sort crops case-insensitively in the plantings form. Miles Gould 2013-01-25 00:16:50 +00:00
  • 4448468ee7 fixed problems with tab display on member profile Skud 2013-01-20 21:46:53 +11:00
  • 73d1eb0879 Merge pull request #89 from Skud/planting-links pozorvlak 2013-01-18 13:06:57 -08:00
  • e7a735185e Merge pull request #91 from gnattery/friendly-plantings pozorvlak 2013-01-18 13:06:09 -08:00
  • 956486f1ab Merge pull request #90 from gnattery/garden-description pozorvlak 2013-01-18 12:59:42 -08:00
  • 9f788ba8df added friendly IDs for plantings, and tests gnattery 2013-01-18 16:06:20 +11:00
  • 72f38118d9 Slight tweak to garden slug tests gnattery 2013-01-18 15:39:10 +11:00
  • dea5d2399c Migration for planting slugs gnattery 2013-01-18 15:37:36 +11:00
  • 9e4e1746e1 Link to the planting, not the crop. Skud 2013-01-18 15:14:40 +11:00
  • d1e3f8ce32 Added description field to gardens gnattery 2013-01-18 15:11:11 +11:00
  • 46dd7ed346 Display thumbnail inside a .well, optionally hide description Skud 2013-01-18 14:04:45 +11:00
  • 54965654bd Small refactoring: use the date format we made Skud 2013-01-18 13:42:20 +11:00
  • 1503cbddad Plantings show on members, gardens, and crops pages Skud 2013-01-18 13:40:30 +11:00
  • 1da6c83fa1 Showing plantings on crops page. Ugly for now, but works. Skud 2013-01-17 15:35:30 +11:00
  • c1c218a2f3 Removed 20 random plantings Skud 2013-01-17 15:22:30 +11:00
  • a0b74562f5 remote "Note" about random selection of crops Skud 2013-01-17 15:16:38 +11:00
  • 501cad39f9 Plantings now show up on members and gardens pages Skud 2013-01-17 15:12:37 +11:00
  • c07e27df14 Merge pull request #88 from jcaudle/fix-redirect-spec pozorvlak 2013-01-15 15:41:13 -08:00
  • fd54fe8ffe Configure application to have UTC as default timezone Joseph Caudle 2013-01-14 22:17:36 -05:00
  • a6cf755cb6 Add debugger gem Joseph Caudle 2013-01-14 22:06:20 -05:00
  • d00b5febe8 Merge pull request #87 from Skud/user2member pozorvlak 2013-01-13 17:12:03 -08:00
  • aaeb5641e7 Merge pull request #85 from Skud/fg2 pozorvlak 2013-01-13 13:41:47 -08:00
  • 47719709ad Remove broken migrations Skud 2013-01-13 11:49:58 +00:00
  • 7abe7167d3 Fixed reference to User in db/seeds.rb Skud 2013-01-13 11:33:16 +00:00
  • 4dec806589 FGified the login_member method Skud 2013-01-13 21:46:46 +11:00
  • c4cac871d5 Fixed up tests for garden display Skud 2013-01-13 21:43:20 +11:00
  • 7579d894aa Renamed default garden in /spec/factory/garden Skud 2013-01-13 21:32:54 +11:00
  • 8da9a13eae Changed garden.member_id to garden.owner_id Skud 2013-01-13 21:29:28 +11:00
  • df76f2497a renamed Post.member_id to Post.author Skud 2013-01-13 20:57:28 +11:00
  • 689448f87c renamed Member.username to login_name Skud 2013-01-13 19:14:46 +11:00
  • 354c712948 Rearranged routes so that devise worked with "members" Skud 2013-01-13 18:38:38 +11:00
  • edb59e07ee s/users/members/g -- all tests pass Skud 2013-01-13 18:33:43 +11:00
  • fdb309cdd2 s/users/members/g -- controllers and their tests Skud 2013-01-13 17:53:24 +11:00
  • 657ccf7cd8 s/users/members/g -- models and tests for them Skud 2013-01-13 17:24:46 +11:00
  • 801a3d0f6c Added some basic tests for RSS feeds. Skud 2013-01-13 17:06:36 +11:00
  • cc7519cd59 s/update/post in routing. I think this is it! Skud 2013-01-13 16:44:03 +11:00
  • 48d8b39b0a s/update/post in members controller, plus tests Skud 2013-01-13 16:40:07 +11:00
  • dc9b8b8aa9 All spec tests now pass with s/update/post Skud 2013-01-13 16:33:08 +11:00
  • fc4c409cf4 Tests for views/posts now work. Skud 2013-01-13 16:18:48 +11:00
  • 21f0f39bf9 Model and controller spec files pass. Skud 2013-01-13 16:12:45 +11:00
  • 576ba289eb FGified model/update tests Skud 2013-01-13 15:51:09 +11:00
  • 72bb1a641f Made the :user factory be confirmed by default. Skud 2013-01-13 13:10:24 +11:00
  • cf7c092220 FGified models/garden tests. Skud 2013-01-13 12:58:26 +11:00
  • ecd9cc19fc FGified models/planting tests Skud 2013-01-13 12:52:57 +11:00
  • 1e02e42665 FGified view/plantings tests Skud 2013-01-13 12:49:30 +11:00
  • 0972429087 Turned a contains into an assert_select. This is better. Skud 2013-01-13 12:33:47 +11:00
  • 8b0fa9e050 FGified garden tests. Removed some spurious bits. Skud 2013-01-13 12:17:06 +11:00
  • 988d2c67c0 FGified and slightly improved updates tests Skud 2013-01-13 12:08:02 +11:00
  • 7aac659749 FGified and generally improved members/show tests Skud 2013-01-13 11:38:54 +11:00
  • 8b44b97c7e This doesn't need a confirmed user, just a basic one. Skud 2013-01-13 11:37:13 +11:00
  • 007c7e5fae FGified views/members/index Skud 2013-01-13 11:15:07 +11:00
  • b1277d4132 FGified user model tests Skud 2013-01-13 11:05:55 +11:00
  • 7dd17c4e8b Merge pull request #84 from gnattery/factorygirl pozorvlak 2013-01-11 04:43:58 -08:00
  • a3de3ddbb2 Removed some stuff hanging around from previous experiments gnattery 2013-01-11 13:35:49 +11:00
  • 74a11c5554 Factory-girl-ified the scientific name tests gnattery 2013-01-11 13:15:39 +11:00
  • de49c6499a Added model tests for scientific names gnattery 2013-01-11 12:12:41 +11:00
  • e854858971 factory-girl-ified models/crop tests Skud 2013-01-11 11:41:51 +11:00
  • 46fd6953ac factory-girl-ified the views/crops tests Skud 2013-01-11 11:39:50 +11:00
  • fe24802790 added factorygirl, using it for one test so far Skud 2013-01-11 11:01:34 +11:00
  • f31acc31e2 Merge pull request #83 from cesullivan/dev Skud 2013-01-10 01:47:53 -08:00
  • 46d84903ae Remove time field in planting/new PT 41633333 Cathy Sullivan 2013-01-09 11:54:38 -08:00
  • 6f9470c31f Merge pull request #82 from Skud/heroku-environments pozorvlak 2013-01-09 04:55:57 -08:00
  • 71750889d3 added mandrill smtp settings for staging environment Skud 2013-01-09 23:36:17 +11:00
  • 89ab3fc347 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev Skud 2013-01-09 15:45:37 +11:00
  • 02cdb26ab1 Merge pull request #81 from Skud/upgrade_rails Skud 2013-01-08 20:44:02 -08:00
  • f5f5e35853 Switched from WebRick to thin for a couple of reasons Skud 2013-01-09 11:09:58 +11:00
  • bd17546635 and now rails 3.2.11 because of another security patch Skud 2013-01-09 11:05:44 +11:00
  • e010dc7f4f Merge pull request #79 from pozorvlak/upgrade_rails Skud 2013-01-04 05:08:39 -08:00
  • 075fbae086 Fix version of cape Miles Gould 2013-01-04 13:01:09 +00:00
  • 7319dcffc5 Merge pull request #78 from pozorvlak/upgrade_rails Skud 2013-01-04 04:54:30 -08:00
  • 26f8367430 Fix version of Twitter bootstrap to avoid dependency hell. Miles Gould 2013-01-04 12:45:00 +00:00
  • 03fd77b03e Upgrade to Rails 3.2.10 Miles Gould 2013-01-04 12:33:22 +00:00
  • e58b470c16 Merge pull request #76 from pozorvlak/clickable_avatars Skud 2013-01-03 03:50:22 -08:00
  • 9ece3e9864 Make user pictures into clickable links. Miles Gould 2012-12-29 02:10:10 +00:00
  • a481ea25b1 Factor out gravatar + name into a partial. Miles Gould 2012-12-29 01:56:40 +00:00
  • 42683d733b Merge pull request #72 from gnattery/unconfirmed pozorvlak 2012-12-28 07:26:43 -08:00
  • f5adf601cb Merge pull request #1 from pozorvlak/unconfirmed gnattery 2012-12-28 07:25:45 -08:00
  • 5d4ba46ce4 Move "is user confirmed" checks into model. Miles Gould 2012-12-28 13:29:46 +00:00
  • 898b41d656 Merge pull request #74 from Skud/plantsomething pozorvlak 2012-12-22 15:29:41 -08:00
  • dd301d1777 improved crop/garden pre-selection in planting form Skud 2012-12-23 10:20:51 +11:00
  • 02daab4fc1 added crop_id and garden_id params to controller Skud 2012-12-23 10:01:19 +11:00
  • e5e3bfa93a Merge pull request #71 from pozorvlak/creategarden pozorvlak 2012-12-21 06:09:29 -08:00
  • 30fc533748 Document the need for @garden in MembersController#show Miles Gould 2012-12-21 13:59:29 +00:00
  • 2978a18d4f Add title to "New garden" tab on profile. Miles Gould 2012-12-21 11:02:39 +00:00