Skud
f18feaa131
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
2014-10-18 11:23:30 +01:00
Taylor Griffin
a4e7f93421
Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n
2014-10-16 06:39:10 +11:00
Skud
e4cf636bef
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
app/models/harvest.rb
db/schema.rb
spec/models/harvest_spec.rb
2014-10-15 14:20:16 +01:00
Shiho Takagi
6e02f40e0a
merging from dev
2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01
Added crops-posts association as well as updated GUI for crop show
2014-10-05 13:32:08 +11:00
Taylor Griffin
87b6780220
stop generating helpers, constroller specs, view specs, and javascripts
2014-09-28 21:57:05 +10:00
Taylor Griffin
f9dc17c587
no longer raise exception on missing g translation in dev / test envs
2014-09-28 21:34:26 +10:00
Taylor Griffin
d10a62d336
set locale from subdomain
2014-09-28 21:32:15 +10:00
Skud
4a62add88e
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
spec/models/planting_spec.rb
2014-09-28 15:32:53 +10:00
Skud
529c98f5dc
Move actual sending of planting reminder to rake task
2014-09-28 15:28:53 +10:00
Taylor Griffin
5e48c4392a
move site name into localization
2014-09-24 18:29:59 +10:00
Taylor Griffin
d462254021
add missing translation
2014-09-21 10:26:30 +10:00
Taylor Griffin
e3a6742574
add sample japanese locale file to test changing languages
2014-09-20 21:56:14 +10:00
Taylor Griffin
e3f590ede5
abstract strings in home views into locale file
2014-09-20 21:47:18 +10:00
Taylor Griffin
983fa8ede0
abstract strings out of blurb partial
2014-09-19 07:29:04 +10:00
Taylor Griffin
16f4d2f80e
fix spec to check href with newly added locale query param
2014-09-19 07:17:08 +10:00
Taylor Griffin
f8ee9d0589
don't scope routes to locale to make url prettier because it breaks tests like whoa
2014-09-18 07:14:35 +10:00
Taylor Griffin
87df8661c7
raise exception on missing translations in test and dev environment
2014-09-18 06:24:59 +10:00
Taylor Griffin
f355c393f0
basic setup
2014-09-18 06:15:59 +10:00
Skud
965a3bf2a1
Modernise redirection after signup to use devise's stored_location_for
2014-08-31 18:28:26 +10:00
Skud
2be199abbc
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
Gemfile
Gemfile.lock
app/views/devise/registrations/edit.html.haml
2014-08-30 17:45:19 +10:00
Taylor Griffin
2c50c3b703
merge in a bunch of (mostly bootstrap 3) changes
2014-08-29 07:14:44 +10:00
Skud
561b7c45ac
b3ify and improve design of edit profile page
2014-08-11 14:42:00 +10:00
Taylor Griffin
8a1dd9d171
implement autocomplete for crop name on new planting form
2014-07-26 20:16:22 +10:00
Taylor Griffin
5df0c9c71a
sketch feature test for planting a crop
2014-07-26 08:36:48 +10:00
Skud
250a2b7d02
Merge branch 'bootstrap3' into dev
...
Conflicts:
app/assets/stylesheets/overrides.css.less
2014-07-22 14:24:07 +10:00
Skud
f67732e125
Added checkbox for whether to send planting reminder
2014-07-20 19:17:59 +10:00
Skud
7c09188bb8
Renamed email to planting_reminder
2014-07-20 18:54:58 +10:00
Skud
a7d56d4f92
Added stub code for sending regular (eg. weekly) emails
2014-07-20 17:39:27 +10:00
Taylor Griffin
82598e75f8
fix redirect after reset password bug
2014-07-15 22:57:07 +10:00
Amy Hendrix
6503b2ec7c
Turn off caching in dev
2014-07-13 23:54:37 -04:00
Skud
60b407986d
One more try to get travis working with postgres
2014-07-06 21:34:23 +10:00
Skud
0174202ef0
Remove travis environment
...
We had this special environment because we wanted travis to be different
to our test environment -- specifically, to use postgres, while we used
sqlite in dev/test. We now use postgres in dev/test so this is no
longer necessary.
2014-07-06 20:27:35 +10:00
Skud
8897e5149d
switch to using postgres in dev and test
2014-07-06 20:14:12 +10:00
Skud
d90268bd16
Added note as to why mapbox config isn't in application.yml
2014-06-02 19:00:50 -05:00
Skud
5d587af8b0
replaced cloudmade maps with mapbox
2014-06-02 18:57:03 -05:00
Miles Gould
05a2c9080f
Delete commented-out code.
2014-05-03 16:21:08 +01:00
Skud
b489fda18e
revert to devise 3.0.x due to confirmable misbehaviour
...
as documented here: https://github.com/plataformatec/devise/issues/3009
also update mailer to use letter_opener and also localhost:8080 since
we're mostly using unicorn at this point.
2014-05-01 22:48:52 +10:00
Skud
9e5c5239a8
Need to put the site name in .travis.yml for tests to pass
2014-04-29 13:46:54 +10:00
Skud
ee27b3bd6a
updated docs in application.yml.example
2014-04-29 13:28:44 +10:00
Skud
8384233f4d
Moved RAILS_SECRET_TOKEN to figaro
...
This is the last of the stuff that was in credentials.sh so I'm removing
the deprecated credentials.example at this point.
2014-04-29 13:18:02 +10:00
Skud
72ce69ea8f
moved flickr and twitter api config to figaro
2014-04-29 13:14:47 +10:00
Skud
b61bbc2170
moved mailchimp settings to figaro
2014-04-29 13:11:57 +10:00
Skud
bf6bb7f620
Moved mandrill config to figaro
2014-04-29 13:07:23 +10:00
Skud
bc36713449
Switched paypal settings to figaro
2014-04-29 13:01:04 +10: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
bacbaf756e
added application.yml.example
2014-04-29 12:29:28 +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
Skud
b86014b04f
attempting to fix libv8 problem occurring on heroku
2014-04-28 13:02:23 +10:00
Skud
74e1e07567
tweaking secret key settings to match what heroku already has
2014-04-28 12:42:23 +10:00
Skud