Commit Graph
13034 Commits
Author SHA1 Message Date
Miles Gould 19f8d70f94 Fix size of boxes on /members; truncate long names 2012-12-06 13:00:14 +00:00
Skud 3548d8f4ee Added edit button to garden page 2012-12-05 21:54:29 +11:00
Skud 18f25a5217 Fixed broken tests. 2012-12-05 21:45:37 +11:00
Skud ea4c2b028f Made the form require login and look slightly prettier. 2012-12-05 21:11:48 +11:00
Skud 87ef580b78 Oops, missed a bit with the merge. 2012-12-05 21:08:24 +11:00
Skud 59083882d6 Merging in changes from dev to mygarden branch 2012-12-05 21:05:40 +11:00
Skud 77233cbb73 Merge pull request #56 from Skud/tos
Terms of service
2012-12-04 21:48:49 -08:00
Skud a0855fd563 Removed wiki link in footer ("About" goes there already) 2012-12-05 16:47:10 +11:00
Skud 7ed0a75788 Added TOS link to footer 2012-12-05 16:43:45 +11:00
Skud 382128c511 Added community guidelines to the app, plus tests 2012-12-05 16:37:20 +11:00
Skud 83d332a825 Added the actual text of the TOS to the TOS view 2012-12-05 16:28:05 +11:00
Skud 64724231e9 Fixed tests to work with TOS agreement 2012-12-05 16:13:08 +11:00
Skud d95f034677 Tweaked the gemfile so that 'rake' would run cleanly.
(Was anyone else having that problem with rake versions?)
2012-12-05 16:02:35 +11:00
Gnat 12b3bdd432 Added validation for TOS agreement
Tests are currently broken, will fix later
2012-12-03 05:22:30 +00:00
Gnat e39ec4c5f8 Added Tos field to the signup form 2012-12-03 05:02:35 +00:00
Gnat 9f1adae238 Made the signup form look better using bootstrap 2012-12-03 04:17:37 +00:00
Gnat 2df881bff6 Update schema for new TOS agreement field 2012-12-03 04:15:33 +00:00
Gnat f2bb4ecb58 Added a migration for the TOS agreement boolean field 2012-12-03 03:55:25 +00:00
Gnat 0b47c60952 Added a page for the TOS 2012-12-03 03:44:54 +00:00
Skud abcd0969ff Merge pull request #55 from Skud/cropoverflow
made the crop box 20 pixels bigger
2012-12-01 19:57:26 -08:00
Skud a1dffbed7a made the crop box 20 pixels bigger 2012-12-02 14:55:03 +11:00
Skud cd72350e9e refactor: remove unneeded %div in HAML 2012-12-02 11:59:31 +11:00
Skud 496a76d635 things flow better with posessive apostrophes 2012-11-26 23:15:49 +11:00
Skud 208afba8c9 'Garden' is a better name, I think 2012-11-26 23:11:16 +11:00
Skud 32061e889b link member page from garden page 2012-11-26 22:59:59 +11:00
Skud e4e150d4be tabbed interface for plantings/updates 2012-11-26 22:54:50 +11:00
Skud ec4360400e removed spurious table tag 2012-11-26 22:50:58 +11:00
Skud ad71d240b3 oops, should be an = here 2012-11-26 22:50:08 +11:00
Skud 91e24e4ac2 fixed broken tests 2012-11-26 22:36:50 +11:00
Skud 1aa59f01d8 Standardised the messages about UI stubs 2012-11-26 22:08:01 +11:00
Skud 1cb80d9645 Link to "My Garden" from member profile page
Also includes random selection of crops
2012-11-26 21:46:30 +11:00
Skud 08302a4864 Randomly display 8 crops on the garden page 2012-11-26 21:34:23 +11:00
Skud 2a64f04c2d Call the thumbnail partial 2012-11-26 21:31:23 +11:00
Skud 1d6fedf712 extracted crop thumbnail into a partial 2012-11-26 20:53:00 +11:00
Skud 6d3a4e6be6 Reformatted this page to use bootstrap and look nicer 2012-11-26 20:49:41 +11:00
Skud 54acbba854 added pivotal tracker rc file to .gitignore 2012-11-26 19:06:09 +11:00
Skud 760cf03b2c Fixed tests by getting rid of valid_session 2012-11-26 19:04:43 +11:00
pozorvlak 1808786670 Merge pull request #54 from Skud/footerscroll
Footerscroll
2012-11-21 02:37:38 -08:00
Skud a226ccd496 Added just a smidge more padding
... so the "new crop" button on /crops isn't hard up against the footer
2012-11-20 23:02:02 +11:00
Skud 4023059ea5 Fixed footer problem by adding padding to body 2012-11-19 10:01:02 +11:00
pozorvlak 1d7dac018f Merge pull request #53 from pozorvlak/crops_formatting
Crops formatting
2012-11-15 16:11:16 -08:00
Miles Gould 6d44bafa31 Change markup of buttons to Bootstrap format. 2012-11-16 00:07:58 +00:00
Miles Gould b6e7cd4479 Fix weird linebreaks on crops index page. 2012-11-15 23:59:03 +00:00
pozorvlak 43999936a2 Merge pull request #52 from pozorvlak/dev
Merged "bootstrap".
2012-11-15 15:34:02 -08:00
Miles Gould 26e4699812 Merged "bootstrap". 2012-11-15 23:22:40 +00:00
Skud 9349eb9d63 Merge pull request #50 from Skud/updaterss3
Fixes problem with devise caused by RSS changes
2012-11-13 03:34:17 -08:00
Skud 0cc4b81d9b Fixes problem with devise caused by RSS changes
The auto discovery links in the head of the HTML were causing
trouble when rails tried to render the devise pages.  It kept
saying it couldn't find a route for /devise/updates.  This seems
to have fixed it.
2012-11-13 22:32:55 +11:00
Skud 9f70027f87 Merge pull request #49 from Skud/updaterss2
Updaterss2
2012-11-13 01:54:10 -08:00
Skud 3ac30007e2 Make member's RSS feed the first/default
In at least one RSS reader (NetNewsWire) it uses the first on the
list, so it makes sense to have the most contextually relevant
one be listed first.
2012-11-13 20:48:40 +11:00
Skud 208553bf89 apparently we need to send just ONE local through 2012-11-13 20:43:56 +11:00