 Marlena Compton
|
5f435b1e82
|
fix conflict in contributors file
|
2014-12-14 10:15:05 -08:00 |
|
|
Taylor Griffin
|
d92d22d99c
|
include ActionController::Caching in Sweeper class
|
2014-12-14 21:03:10 +11:00 |
|
|
Taylor Griffin
|
8829acba3f
|
removed depricated method
|
2014-12-14 15:54:43 +11:00 |
|
|
Taylor Griffin
|
66c4a19ad6
|
revert to previous smtp settings
|
2014-12-14 15:41:29 +11:00 |
|
|
Taylor Griffin
|
a65b78084f
|
change staging smtp settings
|
2014-12-14 15:36:56 +11:00 |
|
|
Taylor Griffin
|
cdaa9c03a2
|
Merge branch 'rails4-upgrade'
|
2014-12-14 14:51:36 +11:00 |
|
|
Taylor Griffin
|
a35a573b2b
|
update follow member code to be rails 4 compatible
|
2014-12-14 14:51:18 +11:00 |
|
|
Taylor Griffin
|
0afd9dfbe2
|
Merge pull request #608 from pozorvlak/libv8_fix
Fix problems installing libv8 on OS X.
|
2014-12-14 12:08:01 +11:00 |
|
|
Miles Gould
|
c446ea9232
|
Upgrade libv8 to v3.16.14.7.
The old version was breaking `bundle install` on OS X.
|
2014-12-13 11:56:18 +00:00 |
|
|
Miles Gould
|
43c241219d
|
Update .ruby-version to match Gemfile.
|
2014-12-13 11:56:18 +00:00 |
|
|
Marlena Compton
|
f608685ac8
|
add names to contributors
|
2014-12-12 13:36:11 -08:00 |
|
|
Skud
|
77e424c412
|
Merge branch 'juzham-facebook_button' into dev
|
2014-12-13 08:26:22 +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
|
78c6220262
|
updated the homepage to include a facebook icon. Updated all 'keep in touch' icons to be clickable and open new browser windows
|
2014-12-12 22:56:50 +11:00 |
|
|
Justin Hamman
|
6f2fa1b72b
|
add facebook test
|
2014-12-12 22:27:52 +11:00 |
|
|
Taylor Griffin
|
314cdc687a
|
precompiled assets
|
2014-12-12 22:00:30 +11:00 |
|
|
Taylor Griffin
|
df3b300967
|
remove '/assets' from references to assets
|
2014-12-12 21:31:22 +11:00 |
|
|
Skud
|
b520f9e78b
|
Update CONTRIBUTORS.md
Removed duplicate contributor
|
2014-12-12 18:43:42 +11:00 |
|
|
Skud
|
b7d9924fa7
|
Merge pull request #462 from kevieyang/upgrade_ruby_version
Modified ruby from 2.1.2 to 2.1.5
|
2014-12-10 08:49:15 +11:00 |
|
|
Skud
|
ea41021ae8
|
Merge pull request #463 from yoongkang/cancanredirect
Fix for redirect sign-in not working for all models
|
2014-12-10 08:48:31 +11:00 |
|
|
Kevin Yang
|
7f88157696
|
removed whitespace
|
2014-12-09 14:11:29 +00:00 |
|
|
Yoong Kang Lim
|
a69210ae6b
|
Explicitly add spec for notification
|
2014-12-09 22:07:41 +11:00 |
|
|
Yoong Kang Lim
|
de26dd3708
|
to_s not needed
|
2014-12-09 21:42:17 +11:00 |
|
|
Yoong Kang Lim
|
2fc6bfb77f
|
Merge remote-tracking branch 'upstream/dev' into cancanredirect
|
2014-12-09 21:32:01 +11:00 |
|
|
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 |
|