Taylor Griffin
ab449a65f8
remove 'to be translated' message from ja locale file
2014-10-20 21:27:39 +11:00
Miles Gould
f795918e17
Remove alternate names for crops without IDs.
2014-10-19 22:49:18 +01:00
Miles Gould
badb0c4fe7
Make load altnames task idempotent.
2014-10-19 22:21:29 +01:00
Miles Gould
7c3059fcae
Fix typo in altname CSV
2014-10-19 22:21:10 +01:00
Miles Gould
06a4fcab71
Remove superfluous* error-checks from load_altnames
...
* /me crosses fingers...
2014-10-19 22:19:41 +01:00
Miles Gould
36be5e9533
Hardcode alternate-name CSV file path.
2014-10-19 21:54:46 +01:00
pozorvlak
4a8297360c
Merge pull request #434 from Skud/memberprofile
...
Member profile
2014-10-19 17:32:27 +01:00
Miles Gould
0aea1721d8
Add altname data and include load in deploy-tasks.
2014-10-19 17:24:18 +01:00
Miles Gould
3d10553373
Add Rake task to load altnames.
2014-10-19 17:24:18 +01:00
Miles Gould
af87c9db47
Remove debugger gem
...
It wouldn't install under Ruby 2.1.2, and we weren't using it anyway.
2014-10-19 17:24:18 +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
emmawinston
1daee9612c
Changed set to album on photo page
2014-10-19 14:52:10 +01:00
Skud
dc1afb8913
Added seeds_by_crop_path routes and stuff
2014-10-19 14:25:47 +01:00
Skud
496c070efd
Tweaked layout of crop page sidebar
2014-10-19 14:14:24 +01:00
Skud
f468a8b77b
Changed all h1 to content_for :title
2014-10-19 14:04:55 +01:00
Skud
16677a3b86
Removed underline on header area
2014-10-19 14:04:32 +01:00
Skud
41566d39f3
Added map to member profile page
2014-10-19 13:50:43 +01:00
Miles Gould
e613907506
Check status codes on page visits.
2014-10-19 13:21:30 +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
Miles Gould
29d53a8f8b
Test for notices in altname CRUD features.
2014-10-19 12:02:31 +01:00
Miles Gould
d0f7169c59
Put alternate name features in their own file.
2014-10-19 11:50:21 +01:00
Miles Gould
3a797d4434
Use content_for :title in scientific names index.
2014-10-19 11:42:49 +01:00
Miles Gould
1d3c24ae27
Use content_for :title on altname index page.
2014-10-19 11:28:51 +01:00
Miles Gould
006bc54f3f
Oops, add the altname index HAML file.
2014-10-18 18:13:04 +01:00
Miles Gould
792062e0d2
Make add-altname test more featurey.
2014-10-18 18:02:59 +01:00
Miles Gould
52fd2b86d6
Test altname deletion end-to-end.
2014-10-18 18:01:54 +01:00
Miles Gould
110ae99d83
Fix and test altname index page.
2014-10-18 17:55:56 +01:00
Miles Gould
c447c1cb3a
Make edit-altname test more featurey.
2014-10-18 17:49:13 +01:00
Miles Gould
0ae68737c3
Use login_as helper method in altname feature tests.
2014-10-18 17:43:59 +01:00
Miles Gould
96d2fa1cb6
Put alternate names controller in standard order.
2014-10-18 17:41:52 +01:00
Miles Gould
8a97aa1a9b
Delete redundant old-style test.
2014-10-18 17:34:33 +01:00
Miles Gould
dc2cf5275c
Fix model tests for alternate names.
2014-10-18 17:30:22 +01:00
Miles Gould
c7c85aaa66
Creation and deletion of alternate names
2014-10-18 17:03:54 +01:00
Cesy Avon
edf2f36bcd
Upgrading to ruby 2.1.2
2014-10-18 16:58:23 +01:00
Miles Gould
b009603581
Fix link to crop on alternate name page
2014-10-18 16:54:02 +01:00
Miles Gould
eacfadae20
Make editing alternate names actually do something.
2014-10-18 16:51:43 +01:00
Miles Gould
37eb2a0e34
Show alternate names on their own page.
2014-10-18 16:49:27 +01:00
Miles Gould
10f6214c6c
Views for adding/editing alternate names.
2014-10-18 16:34:38 +01:00
Taylor Griffin