mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-11 09:17:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,173 Commits 61 Branches 82 Tags
release7
Commit Graph

459 Commits

Author SHA1 Message Date
Skud
eeb48e2ad6 Removed sidebar from homepage. 
Also removed extraneous view tests for things we no longer have.
 2015-01-13 20:13:33 +11:00
Miles Gould
401f3e176e Remove the authentications index page 2015-01-11 11:57:13 +00:00
Taylor Griffin
a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Skud
82b70cf893 Merge branch 'facebook_button' of https://github.com/juzham/growstuff into juzham-facebook_button 
Conflicts:
	CONTRIBUTORS.md
 2014-12-13 08:26:07 +11:00
Justin Hamman
6b0a298fd1 modified order and text for Facebook 2014-12-12 23:33:53 +11:00
Justin Hamman
6f2fa1b72b add facebook test 2014-12-12 22:27:52 +11:00
Skud
30c91eb23f Tidy up sidebar on crop detail page 2014-12-01 21:14:44 +11:00
Taylor Griffin
0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Taylor Griffin
f1945151c7 update RSpec true / false matchers 2014-11-16 14:40:50 +11:00
Taylor Griffin
cc31e864d5 update webrat and webrat matchers 2014-11-16 14:31:33 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11:00
Taylor Griffin
8e79199766 wip: upgrading rspec 2014-11-15 22:55:37 +11: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
Skud
a25eb2d631 Deleted old view tests for crops 2014-10-19 16:52:45 +01:00
Skud
82a61387a3 Improved layout of member profile page 
In doing this, I added some content areas for all pages on the site:

1) subtitle
2) buttonbar

These are intended to help standardise the layout of all pages.  On the
member page, the subtitle is the location, and the buttonbar has links
like "edit profile", "upgrade account", etc (or if looking at someone
else's page, then "send message" etc).

I also implemented subtitle/buttonbar on the crop detail page (the
subtitle is the default scientific name).

The rest is just refactoring and tests.  I've removed some view tests
and put them in feature tests instead.
 2014-10-19 12:23:19 +01:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
Skud
9d5c15a7da Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished 
Conflicts:
	spec/features/plantings/planting_a_crop_spec.rb
 2014-09-10 09:12:27 +10:00
Skud
56eaea9c06 Merge pull request #405 from Skud/cropmess 
Crop and photo bugfixes
 2014-09-04 21:23:31 +10:00
Skud
495f4194e7 Fixed test for branding in navbar 2014-09-04 19:02:38 +10:00
Skud
baf8b91a4e Removed fairly pointless test for markup 2014-09-04 18:05:10 +10:00
Skud
d55d2c6409 Ongoing coverage improvements 2014-08-30 17:09:47 +10:00
Skud
4ebc184188 Add finished planting data (and buttons) to plantings index 
I also removed description from the table as it was getting way too full
 2014-08-30 11:11:19 +10:00
Taylor Griffin
2c50c3b703 merge in a bunch of (mostly bootstrap 3) changes 2014-08-29 07:14:44 +10:00
Skud
840a5efc4e Merge remote-tracking branch 'upstream/bootstrap3' into dev 
Conflicts:
	Gemfile.lock
 2014-08-28 08:00:10 +10:00
Taylor Griffin
2a51f66d88 fix seed view tests 2014-08-24 12:11:10 +10:00
Marlena Compton
ec25f2ab91 created list of crop wranglers on the crop wranglers page 2014-08-21 20:11:10 -07:00
Skud
561b7c45ac b3ify and improve design of edit profile page 2014-08-11 14:42:00 +10:00
Taylor Griffin
63673112a7 repair failing view tests after implementing crop-suggest on harvest 2014-08-01 19:26:33 +10:00
Taylor Griffin
094d9c509a write feature spec for create planting functionality 2014-07-29 10:14:20 +10:00
Taylor Griffin
ec060b9cc0 fix most view tests that broke after changing new planting form to auto-suggest crop name 2014-07-27 22:40:14 +10:00
Skud
d558353e4c Merge branch 'scinames' of github.com:Skud/growstuff into Skud-scinames 
Conflicts:
	CONTRIBUTORS.md
 2014-07-22 11:23:08 +10:00
Skud
a0fc8802b2 Allow selection of crop display order (popularity or alphabetical) 
Had some trouble with tests; apparently the counter_cache behaves
differently when it starts counting from 0, which meant that some tests
started failing unless you do @crop.reload to refresh the
plantings_count.  Weird, but oh well.
 2014-07-18 18:37:47 +10:00
Skud
7184a0d5d5 Added scientific name field tests for edit form 2014-07-18 17:29:10 +10:00
Skud
e63b2fb472 Set up sci names in spec file so fields are shown 2014-07-18 17:27:25 +10:00
Taylor Griffin
8b45a1759c got scientific names working on the crop page but view tests are failing 2014-07-13 17:57:55 +10:00
Skud
99c473ab40 Changed headings on places maps to match new menu ('Community map') 2014-07-04 11:13:35 +10:00
Skud
0dac36df74 fixed tests to pass with new map div ids 2014-07-04 11:08:13 +10:00
pozorvlak
ec9bd2bd7b Merge pull request #361 from Skud/crop-map 
Crop map
 2014-07-03 10:44:01 +01:00
Skud
fea7da3546 rearranged crop page headings and added tests 2014-06-30 12:14:06 -07:00
Skud
d10c9d96f1 Fixed whitespace issues and tests 2014-06-28 11:27:26 -07:00
Skud
997186a701 Rearranged menus to save space 2014-06-12 19:27:02 -07:00
Skud
2cd5b1d2ed Changed one config setting (site name) over to figaro 
Also massively simplified the original application.yml.example I
originally committed. Let's do this one step at a time.
 2014-04-29 12:57:16 +10:00
Skud
1c34d428f2 Merge branch 'crop-search' of https://github.com/Skud/growstuff into Skud-crop-search 
Conflicts:
	spec/models/crop_spec.rb
 2014-04-29 11:16:20 +10:00
Miles Gould
4b88bf80f1 Test for spec=any in harvests/new. 2014-01-05 13:20:07 +00:00
Skud
0a3ecdc5ad Added crop search controller and views 2014-01-03 22:29:44 +11:00
Skud
30c1129cab Added route for crop search 2014-01-03 21:28:08 +11:00
Skud
9b278ed05e Added crop search form to header 2014-01-03 21:26:35 +11:00
pozorvlak
06f1d9cb7e Merge pull request #338 from Skud/crop-mentions 
Crop mentions
 2014-01-02 03:16:40 -08:00
Miles Gould
18ccb0d9fb Merge branch 'dev' into harvest-parts 
Conflicts:
	spec/models/harvest_spec.rb
 2013-12-03 13:25:18 +00:00
Skud
11e7055497 Improved case (in-)sensitivity in tests 2013-11-11 11:11:35 +11:00