mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-27 19:23:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
254 Commits 54 Branches 76 Tags
df7538ffd908fbd1da7100bafddfc5296720040e
Commit Graph

254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Skud
df7538ffd9 Merge pull request #67 from cephLpod/count2 
Count2
 2012-12-16 00:54:38 -08:00
cephLpod
5a81e90005 Added update counts to Updates page 2012-12-14 16:16:33 -06:00
cephLpod
2f36e9a0cc Added member count to Members page 2012-12-14 16:11:37 -06:00
cephLpod
8790c0a2b0 Added crop count to Crops page 2012-12-14 16:07:29 -06:00
Skud
69d943e721 Merge pull request #65 from pozorvlak/create_garden 
Give each user a default garden, called "Garden"
 2012-12-11 13:19:56 -08:00
Miles Gould
bf58ff22a6 Give each user a default garden, called "Garden" 
- created by an after_create callback on the user object
 - added test on model object
 - changed test of GET /gardens to expect Garden.all
 2012-12-11 15:50:28 +00:00
Skud
0b4ea69f81 Merge pull request #64 from leto/travis_notifications 
Add IRC and email travis CI notifications
 2012-12-10 17:48:07 -08:00
Jonathan "Duke" Leto
44117a75fd Add IRC and email travis CI notifications 2012-12-10 17:48:57 -08:00
Skud
01efbd5ea4 Merge pull request #62 from pozorvlak/pending_tests 
Remove "pending" tests to clean up rspec output
 2012-12-10 17:29:55 -08:00
pozorvlak
30c87e9014 Merge pull request #63 from leto/travis 
Add Growstuff to Travis CI
 2012-12-10 17:15:22 -08:00
Miles Gould
c3940969c9 Remove "pending" tests 
Most we deleted, because we couldn't think of any interesting tests to
write.
We added a test for the garden_slug method of Garden.
 2012-12-11 00:53:39 +00:00
Jonathan "Duke" Leto
d4089b9b37 Add a travis ci status image 2012-12-10 16:39:05 -08:00
Jonathan "Duke" Leto
53ef0a3b39 Tell Travis CI to run db:migrate first, with trace flags 2012-12-10 16:25:42 -08:00
Jonathan "Duke" Leto
a449a9de26 Add a Travis CI config file 2012-12-10 16:15:40 -08:00
Miles Gould
05a09ac428 Merged "mygarden". 2012-12-09 15:22:20 +00:00
Skud
3fbed91d89 Merge pull request #57 from pozorvlak/memberoverflow 
Fix size of boxes on /members; truncate long names.

Decided to merge for now and create a new story or chore to handle username validation.
 2012-12-09 04:34:47 -08:00
Skud
d32db81bcd Merge pull request #58 from pozorvlak/spec_once 
Only run specs once.
 2012-12-07 14:59:34 -08:00
Skud
681e1ddd60 Merge pull request #59 from pozorvlak/haml_comments 
Update comments in controller classes.
 2012-12-07 14:38:35 -08:00
Miles Gould
dd28420210 Only run specs once. 2012-12-07 12:15:17 +00:00
Miles Gould
aac4839968 Update comments in controller classes. 
They referred to (now nonexistent) .erb files - I've changed them to
refer to the corresponding .haml files.
 2012-12-07 12:01:03 +00:00
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