Yoong Kang Lim
837121265a
Reversed order of authorization and authentication. Also added tests
2014-12-09 21:27:16 +11:00
Kevin Yang
5e2a3db8c2
Added myself to Contributors.md
2014-12-09 20:44:46 +11:00
kevieyang
969c530193
Update .travis.yml
...
upgrading ruby 2.1.2 to 2.1.5
2014-12-09 20:32:47 +11:00
Kevin Yang
e9e238016b
Merge branch 'dev' of https://github.com/Growstuff/growstuff into upgrade_ruby_version
2014-12-09 20:28:54 +11:00
Kevin Yang
899d3c3dbe
Modified ruby from 2.1.2 to 2.1.5
2014-12-09 20:25:45 +11:00
Skud
7227c1f330
Merge pull request #455 from yoongkang/cancanredirect
...
Redirect to sign-in page for any action that requires authentication
2014-12-09 20:17:58 +11:00
Skud
609f3a46b2
Merge pull request #461 from emmawinston/more_semantic_markup
...
Made crop thumbnail markup more semantic
2014-12-09 19:09:45 +11:00
Marlena Compton
dbbd37e59e
BarGroup uses data object
2014-12-06 21:30:38 -08:00
Marlena Compton
482650dec6
bar label group and all tests passing
2014-12-06 21:16:22 -08:00
Marlena Compton
cc22b87cf1
barlabelgroup tests passing still horizontalbargraph tests to fix
2014-12-06 08:30:49 -08:00
emmawinston
58728f6a61
Made crop thumbnail markup more semantic
2014-12-05 02:45:39 +00:00
Skud
94df504840
Merge pull request #459 from Skud/brassicafix
...
Fix parent crop for B. oleracea Acephela group
2014-12-03 14:59:17 +11:00
Skud
c1bcbd2e7d
Fix parent crop for B. oleracea Acephela group
2014-12-03 14:58:46 +11:00
Skud
e5d71df294
Merge pull request #458 from Skud/brassicafix
...
Fixed ordering and capitalisation in brassica import
2014-12-03 14:51:07 +11:00
Skud
a47328eed4
Fixed ordering and capitalisation in brassica import
2014-12-03 14:50:25 +11:00
Skud
0c30f2198c
Merge pull request #437 from pozorvlak/load_alternate_names
...
Load alternate names for crops
2014-12-01 22:22:24 +11:00
Miles Gould
9f54641e95
Find crops by name when loading altnames
...
Crop IDs are not guaranteed to be the same on staging and production.
2014-12-01 11:03:27 +00:00
Miles Gould
4b90f6385b
Merge branch 'dev' into load_alternate_names
...
Conflicts:
Gemfile.lock
script/deploy-tasks.sh
2014-12-01 10:47:10 +00:00
pozorvlak
751a66b49b
Merge pull request #457 from Skud/multiple_scinames
...
Multiple scientific and alternate names
2014-12-01 10:33:46 +00:00
Skud
6f3e430840
Add deploy tasks for new crops
2014-12-01 21:23:15 +11:00
Skud
d0b61c259d
Added squashes and new crops from London working bee
2014-12-01 21:20:44 +11:00
Skud
30c91eb23f
Tidy up sidebar on crop detail page
2014-12-01 21:14:44 +11:00
Skud
82a5379a25
Added mint family and brassica crops (seed files)
2014-12-01 20:53:17 +11:00
Skud
593a20c0c5
Load alternate names from CSV
2014-11-30 16:06:43 +11:00
Taylor Griffin
d174f25d03
order messages to be most recent
2014-11-30 16:06:06 +11:00
Taylor Griffin
e7bb285b8e
Merge pull request #448 from yoongkang/followerdev
...
Allow members to follow other members
2014-11-30 16:04:35 +11:00
Yoong Kang Lim
b06d48091e
Indentation problem
2014-11-30 15:50:13 +11:00
Skud
844791ead9
Allow multiple comma-separated scientific names
2014-11-30 15:48:58 +11:00
Yoong Kang Lim
73d6b5065b
Use factorygirl aliases
2014-11-30 15:25:48 +11:00
Yoong Kang Lim
7ddaca6e11
Use .size instead of .count
2014-11-30 15:19:50 +11:00
Yoong Kang Lim
2036a0f2e9
Used environment variable for site name instead
2014-11-30 15:18:13 +11:00
Yoong Kang Lim
27ad791f67
Merge remote-tracking branch 'upstream/dev' into followerdev
2014-11-30 15:16:48 +11:00
Yoong Kang Lim
13c98eac89
Wrapped tests around context blocks to clarify the purpose of the tests.
2014-11-30 15:14:56 +11:00
Justin Hamman
6d2d6a51d5
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
2014-11-30 15:02:20 +11:00
Skud
4e19da56a0
Rearrange fields in crop uploads (sci names last)
2014-11-30 14:51:33 +11:00
Taylor Griffin
cf7ead3d84
Merge branch 'dev' of https://github.com/Growstuff/growstuff into rails4-upgrade
2014-11-30 14:36:10 +11:00
Yoong Kang Lim
969f7e7c23
Merge remote-tracking branch 'upstream/dev' into cancanredirect
2014-11-30 14:25:08 +11:00
Taylor Griffin
14e8c367e1
Merge pull request #456 from Skud/paidaccountbug
...
Fixed a bug which only occurs in the few months before February
2014-11-30 14:23:19 +11:00
Skud
924efe6af5
Fixed a bug which only occurs in the few months before February
...
This is the fundamental problem:
2.1.2 :005 > Time.zone.now + 3.months
=> Sat, 28 Feb 2015 03:17:24 UTC +00:00
2.1.2 :006 > Time.zone.now + 3.months + 3.months
=> Thu, 28 May 2015 03:17:32 UTC +00:00
2.1.2 :007 > Time.zone.now + 6.months
=> Sat, 30 May 2015 03:17:37 UTC +00:00
I changed the test to use the "3.months + 3.months" formulation and it
now passes.
2014-11-30 14:19:55 +11:00
Justin Hamman
23f524a236
Merge branch 'master' of https://github.com/Growstuff/growstuff into dev
2014-11-30 14:06:48 +11:00
Skud
39b47b0d08
Merge pull request #454 from krio/rearrange-rss-titles
...
Rearrange titles on RSS feeds
2014-11-30 13:37:30 +11:00
Taylor Griffin
18c40809a6
Merge branch 'dev' of https://github.com/Growstuff/growstuff into rails4-upgrade
2014-11-29 22:20:58 +11:00
Marlena Compton
8826b0137a
changed growtuff to growstuff which fixed tests
2014-11-26 13:55:27 -08:00
Marlena Compton
d4d76b2e8d
committing tests classes I thought I committed earlier :/
2014-11-26 13:48:22 -08:00
Yoong Kang Lim
81d1189203
Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in
2014-11-24 22:12:42 +11:00
Kevin Rio
2111cddaef
RSS feed tests
2014-11-23 21:02:56 -05:00
Marlena Compton
994ee18f13
Merge remote-tracking branch 'upstream/master'
2014-11-23 14:36:21 -08:00
Kevin Rio
eb4fae463f
Comments RSS tests
2014-11-23 11:47:48 -05:00
Yoong Kang Lim
8c55a6101d
Formatting problem
2014-11-21 01:14:12 +11:00
Yoong Kang Lim
2ca42bbae3
Slight modification to the notification wording.
2014-11-21 01:05:23 +11:00
