mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-10-08 22:23:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,006 Commits 66 Branches 92 Tags
bd8be01ec71825ea5c01c6ef367ef9d346848bbb
Commit Graph
2006 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Yoong Kang Lim bd8be01ec7 Merge branch 'dev' into editprofile 
Conflicts:
	CONTRIBUTORS.md
 2014-11-13 21:38:05 +11:00
Yoong Kang Lim 3dbb585467 Removed edit profile button from home page 
Added yoongkang to the contributors list

Feature test for edit profile button on homepage
 2014-11-13 21:28:15 +11:00
Skud f56c184033 Merge branch 'tygriffin-finish-plantings-javascript' into dev 2014-11-13 10:58:06 +11:00
Skud 68dfdbeba1 Merge branch 'finish-plantings-javascript' of github.com:tygriffin/growstuff into tygriffin-finish-plantings-javascript 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-11-13 10:57:55 +11:00
Skud 0ffa3a6d0f Merge pull request #438 from tygriffin/byebug 
replace debugger with byebug
 2014-11-13 10:51:53 +11:00
Skud 1749bc52f8 Merge pull request #446 from krio/switch-activity-contact 
Switch "activity" and "contact" on member profile page
 2014-11-12 17:59:37 +11:00
Kevin Rio b6d2a078b1 Adding to contributors list 2014-11-11 23:28:22 -05:00
Kevin Rio 7023b4969b Update position of activity on member details page 
Switched activity and contact.
 2014-11-11 22:42:01 -05:00
pozorvlak f233d502f7 Merge pull request #445 from yoongkang/plantingsfix 
Plantings index should display finished at date instead of planted at under the finished column
 2014-11-11 20:55:23 +00:00
Yoong Kang Lim caad748d08 Plantings index should display finished at date instead of planted at under the finished column. 
Added feature test for plantings index page.
 2014-11-11 22:41:29 +11:00
Taylor Griffin 5b13e8c797 Merge pull request #444 from Skud/plantingreminder 
cweek not cw_week
 2014-11-11 20:55:37 +11:00
Skud 267c671259 cweek not cw_week 2014-11-11 20:55:04 +11:00
Taylor Griffin f8df8803ab catch up with upstream dev 2014-11-11 19:57:16 +11:00
Taylor Griffin 1d071c197a Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 19:53:00 +11:00
Taylor Griffin 50b8acc67c put finished at bottom of list to make it more obvious when marking a planting finished 2014-11-11 19:52:31 +11:00
Taylor Griffin 3f23dd194d Merge pull request #443 from Skud/plantingreminder 
Planting reminder - only send to confirmed accounts
 2014-11-11 19:48:10 +11:00
Skud 98c07ff3f1 Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 2014-11-11 19:45:51 +11:00
Skud eb98910bea Only send planting reminders to confirmed accounts 2014-11-11 19:45:07 +11:00
Taylor Griffin 954d5b8427 Merge pull request #442 from Skud/destroy_photo_destroyer 
Fixed bug in deleting unused photos
 2014-11-11 19:42:22 +11:00
Skud 2426c51951 Fixed bug in deleting unused photos 
... and wow, my tests were really not testing what I thought they were
testing :-/
 2014-11-11 19:29:32 +11:00
Taylor Griffin af9aa690ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 18:37:30 +11:00
pozorvlak 24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00:00
Skud 7b80db9596 Merge pull request #5 from pozorvlak/plantingreminder 
Fix broken Capybara tests
 2014-11-07 09:28:46 +11:00
Miles Gould b989168887 Fix "shared example group previously defined" warning 
We were getting the warning

```
WARNING: Shared example group 'crop suggest' has been previously defined
at:
  /Users/miles/src/growstuff/spec/features/shared_examples/crop_suggest_spec.rb:3
...and you are now defining it at:
  /Users/miles/src/growstuff/spec/features/shared_examples/crop_suggest_spec.rb:3
The new definition will overwrite the original one.
```

Following the suggestion at
https://github.com/rspec/rspec-core/issues/828#issuecomment-38789977,
I've renamed crop_suggest_spec.rb to crop_suggest.rb, which made the
error go away without reducing the number of tests run. RSpec must
have thought it was a spec file and loaded it directly, then loaded it
again when it was first required by an actual spec file.
 2014-11-02 22:57:29 +00:00
Miles Gould 6921119301 Make Capybara actually hit the server. 
Background:
http://talk.growstuff.org/t/mysteriously-broken-feature-tests/120

@oshiho3's suggested fix didn't work, so I tried all the suggestions at
http://stackoverflow.com/questions/6536503/capybara-with-subdomains-default-host
until I found one that fixed the problem.
 2014-11-02 22:21:32 +00:00
Taylor Griffin 0ccd6e843a implement confirm without date functionality on appty on append date js 2014-10-23 22:43:38 +11:00
Taylor Griffin 9b10a7c3ce write shared example group for append date 2014-10-23 22:18:52 +11:00
Taylor Griffin 36e827b445 Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-10-23 19:01:58 +11:00
Taylor Griffin f62ce257da catch up with upstream dev 2014-10-23 19:00:55 +11:00
Skud 0d893470de Merge pull request #439 from tygriffin/I18n 
I18n
 2014-10-23 10:06:33 +11:00
Taylor Griffin e9d1d11535 add append date functionality for planting finished on garden show page and planting list page 2014-10-21 19:43:51 +11:00
Taylor Griffin c244da8b73 make English fallback language 2014-10-21 07:24:08 +11:00
Taylor Griffin 48875dacb3 remove pry because it's redundant with byebug 2014-10-21 06:53:21 +11:00
Taylor Griffin a6508b5c9f replace debugger with byebug 2014-10-20 22:47:13 +11:00
Taylor Griffin 0e11f20910 Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n 2014-10-20 21:27:59 +11:00
Taylor Griffin ab449a65f8 remove 'to be translated' message from ja locale file 2014-10-20 21:27:39 +11:00
pozorvlak 4a8297360c Merge pull request #434 from Skud/memberprofile 
Member profile
 2014-10-19 17:32:27 +01:00
Skud e8daba750d Merge pull request #433 from pozorvlak/feature_tests_for_scinames 
Feature tests for scientific names
 2014-10-19 16:54:31 +01:00
Skud a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile 
Conflicts:
	app/views/scientific_names/index.html.haml
 2014-10-19 16:54:10 +01:00
Skud a25eb2d631 Deleted old view tests for crops 2014-10-19 16:52:45 +01:00
Skud 58f1bca683 removed spurious console.log calls 2014-10-19 16:51:08 +01:00
Miles Gould b17aaf262d Test HTTP statuses in sciname feature tests 
This makes it easier to tell the difference between "test failed because
the expected content isn't there" and "test failed because the whole
page is broken". It also guards against "test passed incorrectly because
the expected content was part of the error message".
 2014-10-19 16:36:10 +01:00
Miles Gould 56b7d89d9e Link scinames to crops, don't show numeric crop IDs 2014-10-19 16:36:10 +01:00
Miles Gould 6de2112c4d Display note on successful sciname deletion. 2014-10-19 16:36:10 +01:00
Miles Gould 2aabcce70d Feature tests for scientific names. 2014-10-19 16:36:10 +01:00
Skud 7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
Skud de6d3589d1 Merge pull request #436 from pozorvlak/ruby212 
Upgrade Ruby to v2.1.2
 2014-10-19 16:18:33 +01:00
pozorvlak 9e9aa82099 Merge pull request #435 from emmawinston/album 
Changed set to album on photo page
 2014-10-19 15:24:24 +01:00
Miles Gould ef8d552301 Update Ruby to 2.1.2 in .travis.yml 2014-10-19 15:06:34 +01:00
emmawinston e5cd14cd45 Added myself to the contributors file 2014-10-19 14:56:44 +01:00