mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-27 11:14:31 -04:00
Code Issues Packages Projects Releases Wiki Activity
791 Commits 54 Branches 76 Tags
c2ef94de8a60a1f3e9c30ebd63b503f2cb6c257a
Commit Graph

791 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Miles Gould
6d8880da2a Test for presence of an unlock link. 2012-09-14 23:07:50 +01:00
Miles Gould
318a0afb35 HAMLify some pages. 2012-09-13 17:02:36 +01:00
Miles Gould
60add22a42 More pre-hamlification tests for views. 2012-09-13 16:40:50 +01:00
Miles Gould
ddc3ae1f01 Don't repeat tests for all links in application spec. 2012-09-12 21:29:07 +01:00
Cesy Avon
7bd0c36162 More unit tests for HAML 2012-09-12 12:42:22 -07:00
Cesy Avon
173aad7dea Adding tests in preparation for HAML 2012-09-12 11:56:22 -07:00
Cesy Avon
0c3bcbdb1e HAML-ify new session 2012-09-12 11:52:38 -07:00
Skud
4045b676f8 tweaked capistrano config to point to the actual dev branch 2012-09-12 09:52:03 +01:00
Skud
e6c52527a7 removing line i previously commented out at passenger's suggestion 2012-09-12 09:48:39 +01:00
Skud
bc9f6eea52 added compass to gemfile 2012-09-12 09:41:30 +01:00
Skud
75ca01188d commenting out 'unshift' line as recommended by error message from passenger' 2012-09-12 09:23:49 +01:00
Miles Gould
802c762004 Test for email confirmation page. 2012-09-10 23:38:25 +01:00
Miles Gould
f076438ef9 Test for footer. 2012-09-10 23:06:23 +01:00
Miles Gould
7111c9e2bc Fix extra paragraph break in index page. 2012-09-10 22:51:13 +01:00
Miles Gould
5d50bb9823 HAMLify the links in the footer. 2012-09-10 22:49:29 +01:00
Miles Gould
15ce32e786 Only stash unindexed changes if there are any. 
This allows `git commit --amend` to work properly.
 2012-09-10 17:42:29 +01:00
Miles Gould
bbcd272d1c Document CI setup in README. 
This probably isn't the best place for it, but I don't want to put that
info on the wiki unless this branch is merged.
 2012-09-10 15:47:10 +01:00
Miles Gould
b173aad6b7 Added pre-commit hook script to run spec tests. 
Based on instructions found at
http://codeinthehole.com/writing/tips-for-using-a-git-pre-commit-hook/

I have no idea how portable this will be.
 2012-09-10 15:29:49 +01:00