mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-31 20:26:34 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 61 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Miles Gould
ea3067ff36 Replace most of the HTML-in-HAML 
- We do this by moving code between files such that every tag starts
   and ends within a single file. This seems like a good invariant to
   maintain from a robustness point-of-view.
 - One consequence is that I had to split _header into _meta (metadata -
   the HTML head tag) and _header (the visible page header). These
   probably aren't the best names.
 - I've left some HTML in _meta, on the grounds that it maintains the
   file-contains-whole-tag invariant and the HTML code is fractionally
   shorter than the HAML required to generate it.
 2012-09-18 19:25:18 +01:00
Skud
a959d491e8 added comments to explain mix of HTML and HAML in header/footer fragments 2012-09-17 18:24:49 +01:00
Skud
e2f035265a oops, don't need that HTML comment there 2012-09-17 18:13:44 +01:00
Skud
7edd3c5fe9 cleaned up interaction of HAML and foundation, broke out a new header fragment 2012-09-17 18:13:16 +01:00
Skud
3f38460273 Merge branch 'haml' of https://github.com/cesy/growstuff into dev 2012-09-16 23:22:10 +01:00
Skud
43570e5e8e fixed merge problems in Gemfile 2012-09-16 23:20:19 +01:00
Skud
9a5ea87ea0 Merge pull request #14 from Skud/story13zurb 
Story13zurb
 2012-09-15 03:42:24 -07:00
Skud
4f40588435 fixed broken tests (mea culpa) 2012-09-15 11:41:32 +01:00
Skud
8570d4fd9a we should definitley be using compass-rails not compass 2012-09-15 11:30:17 +01:00
Skud
01a98bc90b Merge pull request #13 from Skud/story13zurb 
Story13zurb
 2012-09-15 03:18:12 -07:00
Skud
ae6ac886a3 Prettified index.html using zurb foundation 2012-09-15 11:17:14 +01:00
Skud
996d14ade8 i think this is everything for zurb. maybe. 2012-09-15 11:12:05 +01:00
Skud
aeb9b5619b ran compass install to get foundation JS 2012-09-15 11:12:05 +01:00
Skud
a0ef6dcb75 uhh, i don't even remember how this got added 2012-09-15 11:12:04 +01:00
Skud
927dc45147 i think i've got foundation working. maybe. 2012-09-15 11:12:04 +01:00
Skud
ef9bf992d8 still trying to get zurb foundation working 2012-09-15 11:11:11 +01:00
Skud
6e0c7cf02c installed zurb, ran various rails g scripts from http://foundation.zurb.com/docs/gem-install.php#simple2 2012-09-15 11:11:11 +01:00
Skud
b06e9c44db Merge pull request #12 from Skud/story4deploy 
Story4deploy
 2012-09-15 02:48:39 -07:00
Skud
bc010f8e41 migrate db after deploying 2012-09-15 10:47:21 +01:00
Skud
8c8c796bc5 deploy now seems to be working 2012-09-15 10:43:17 +01:00
Skud
8cdd477745 fixing merge from upstream dev branch 2012-09-15 10:24:56 +01:00
Skud
e2751a488c using cape to run rake tasks on dev server 2012-09-15 10:22:51 +01:00
Skud
4fa0eda475 go back to deploying this branch (not dev) for testing 2012-09-15 09:54:16 +01:00
Skud
0d5a879c4e compile assets (css etc) in production (i.e. dev) as per http://stackoverflow.com/questions/7275636/rails-3-1-0-actionviewtemplateerrror-application-css-isnt-precompiled 2012-09-15 09:50:58 +01:00
Miles Gould
25a0c0caeb Finish Hamlifying Devise-generated views. 2012-09-14 23:47:49 +01:00