 Maia Sauren
|
2273e28992
|
added 'development site' to header
|
2012-10-25 22:23:22 +11:00 |
|
|
Skud
|
f64f8c4e82
|
Update README.md
|
2012-10-06 23:29:01 +02:00 |
|
|
Skud
|
b6285634fd
|
Update README.md
|
2012-10-06 23:28:38 +02:00 |
|
|
Skud
|
07a8c68866
|
Update README.md
|
2012-10-06 23:26:47 +02:00 |
|
|
Skud
|
735dc964cc
|
Merge pull request #37 from Skud/staging
More tweaks to get staging working
|
2012-10-06 13:53:11 -07:00 |
|
|
Skud
|
be029541ee
|
and the database config
|
2012-10-06 21:52:40 +01:00 |
|
|
Skud
|
cac912c95f
|
More tweaks to get staging working
|
2012-10-06 21:48:59 +01:00 |
|
|
Skud
|
82cd399b11
|
Merge pull request #36 from Skud/staging
missed a comma
|
2012-10-06 13:41:34 -07:00 |
|
|
Skud
|
a1f4fbde02
|
missed a comma
|
2012-10-06 21:37:14 +01:00 |
|
|
Skud
|
5a6ce0af25
|
Merge pull request #34 from Skud/staging
Deploy to staging environment
|
2012-10-06 13:35:15 -07:00 |
|
|
Skud
|
58d3f91b9d
|
Deploy to staging environment
as per http://cjohansen.no/en/rails/multi_staging_environment_for_rails_using_capistrano_and_mod_rails
|
2012-10-06 21:33:08 +01:00 |
|
|
Cesy
|
ee7ca79c78
|
Merge pull request #33 from Skud/deployassets
We don't need to restart twice.
|
2012-10-06 07:54:14 -07:00 |
|
|
Skud
|
87146ac1b0
|
We don't need to restart twice.
|
2012-10-06 15:23:18 +01:00 |
|
|
Skud
|
415c76268b
|
Merge pull request #32 from Skud/deployassets
Rearranged the order of deploy tasks.
|
2012-10-06 07:13:58 -07:00 |
|
|
Skud
|
6c4aa94a97
|
Rearranged the order of deploy tasks.
We want to make sure that assets:precompile runs, and that there's a
restart afterwards.
|
2012-10-06 15:11:39 +01:00 |
|
|
Cesy
|
ad7c655d3f
|
Merge pull request #31 from Skud/bug74resendconfirmation
You can now reconfirm using email or username.
|
2012-10-06 06:57:00 -07:00 |
|
|
Skud
|
140852afed
|
You can now reconfirm using email or username.
Also, cleaned up the standard devise links that show up everywhere, removing signup/signin as they duplicate what's in our header.
|
2012-10-06 14:53:50 +01:00 |
|
|
Skud
|
5fbcf95743
|
Merge pull request #30 from Skud/fixemailinprod2
Fixemailinprod2
|
2012-10-06 05:50:47 -07:00 |
|
|
Skud
|
8916b91791
|
This sends mail correctly on the server, using sendmail.
|
2012-10-06 13:46:09 +01:00 |
|
|
Skud
|
617feb457e
|
Make email work in production
|
2012-10-06 13:42:16 +01:00 |
|
|
Skud
|
1affa92c4e
|
Merge pull request #28 from Skud/dbdeployment
Need to actually call this task
|
2012-10-06 05:02:56 -07:00 |
|
|
Skud
|
4497bb8850
|
Need to actually call this task
|
2012-10-06 13:02:07 +01:00 |
|
|
Skud
|
b2e767a3c2
|
Merge pull request #27 from Skud/dbdeployment
Keep postgres password out of database.yml, populate it via cap deploy i...
|
2012-10-06 04:51:10 -07:00 |
|
|
Skud
|
c5cfef04d9
|
Keep postgres password out of database.yml, populate it via cap deploy instead.
|
2012-10-06 12:45:51 +01:00 |
|
|
Skud
|
66339f9d5e
|
Merge pull request #23 from federicomenaquintero/dev
In the page footer, add a link to the wiki
|
2012-10-05 11:57:41 -07:00 |
|
|
pozorvlak
|
b5dcad055d
|
Merge pull request #26 from Skud/story72cropediting
Story72cropediting
|
2012-10-03 13:40:39 -07:00 |
|
|
Skud
|
8b353067be
|
Fixed a small bug in this test file.
|
2012-10-03 21:35:24 +01:00 |
|
|
Skud
|
ac63649754
|
Merge pull request #25 from pozorvlak/story67cropindex2
Story67cropindex2
|
2012-10-03 13:03:37 -07:00 |
|
|
Miles Gould
|
7024591269
|
Include password for production from secret file.
We read in the file using ERB. See
http://stackoverflow.com/questions/18290/how-do-you-secure-database-yml
|
2012-10-03 20:59:22 +01:00 |
|
|
Miles Gould
|
3419a559e1
|
Require a system name for crops.
|
2012-10-03 20:38:39 +01:00 |
|
|
Miles Gould
|
79a98d6225
|
Only use Postgres in production.
|
2012-10-03 20:04:56 +01:00 |
|
|
Skud
|
dc00e06bad
|
Added tests for logged-in-ness in a few other places.
Turned actions ("add new", "edit', etc) into buttons using Zurb CSS.
|
2012-10-02 22:41:36 +01:00 |
|
|
Skud
|
aa0ff3869e
|
Need to be logged in to edit crops.
|
2012-10-02 22:15:56 +01:00 |
|
|
Skud
|
7452d7ae39
|
Switched to postgres instead of sqlite3
|
2012-10-02 21:44:01 +01:00 |
|
|
Federico Mena Quintero
|
b2c9429ba9
|
Make the About link in the footer point to the new wiki
Signed-off-by: Federico Mena Quintero <federico@gnome.org>
|
2012-10-02 09:46:32 -05:00 |
|
|
Federico Mena Quintero
|
b84f4eaed8
|
In the page footer, add a link to the wiki
Signed-off-by: Federico Mena Quintero <federico@gnome.org>
|
2012-10-02 09:42:40 -05:00 |
|
|
Miles Gould
|
622ddf620a
|
Refactor h2s into content_for :title
Now the alert and notice are shown below the subtitle, and the browser
title bar tells you something useful.
|
2012-10-02 11:32:56 +01:00 |
|
|
Miles Gould
|
b85354f099
|
Prettify views for crops.
|
2012-10-02 11:32:56 +01:00 |
|
|
Miles Gould
|
1d9c1b14fc
|
Generate scaffold for Crops; refactor tests
Add link to Crops page from index
Refactored index/application tests to better reflect where things are.
|
2012-10-02 11:32:56 +01:00 |
|
|
Miles Gould
|
6454ad09ee
|
Prevent generators from overriding our CSS.
|
2012-10-02 11:32:56 +01:00 |
|
|
pozorvlak
|
f535bf3fbc
|
Merge pull request #22 from Skud/dev
Fix some homepage problems
|
2012-09-24 13:50:59 -07:00 |
|
|
Skud
|
76d1eef20c
|
Merge branch 'dev' of https://github.com/Growstuff/growstuff into homepagecleanup
|
2012-09-24 21:30:24 +01:00 |
|
|
Skud
|
be9d20df0b
|
Merge pull request #20 from Skud/fixfooters
Fixfooters
|
2012-09-24 13:25:33 -07:00 |
|
|
Skud
|
2ae0a7ad16
|
Merge pull request #1 from pozorvlak/fixfooters
Possible alternative to embedding HTML in HAML
|
2012-09-24 13:24:23 -07:00 |
|
|
pozorvlak
|
7728088c2e
|
Merge pull request #19 from Skud/story4deploy
precompile assets after deploying
|
2012-09-24 13:20:32 -07:00 |
|
|
Skud
|
f6bc259c68
|
precompile assets after deploying
|
2012-09-24 21:17:11 +01:00 |
|
|
Skud
|
2c3945ffbe
|
Merge pull request #18 from pozorvlak/heroku2
Stop `rake assets:precompile` from dying, hopefully
|
2012-09-24 13:09:54 -07:00 |
|
|
Miles Gould
|
a2fede15e9
|
Don't connect to the DB when precompiling assets.
See
https://devcenter.heroku.com/articles/rails3x-asset-pipeline-cedar#troubleshooting
|
2012-09-24 21:05:20 +01:00 |
|
|
Miles Gould
|
387d68185d
|
Wrap dev/test Rake tasks in error recovery
Rake was dying due to missing gems in production.
|
2012-09-24 21:05:20 +01:00 |
|
|
Skud
|
7ef4a6784f
|
fixed paragraph break, removed user signin stuff which is now in header
|
2012-09-24 20:44:35 +01:00 |
|