Commit Graph

  • 6454ad09ee Prevent generators from overriding our CSS. Miles Gould 2012-10-01 22:22:14 +01:00
  • f535bf3fbc Merge pull request #22 from Skud/dev pozorvlak 2012-09-24 13:50:59 -07:00
  • 76d1eef20c Merge branch 'dev' of https://github.com/Growstuff/growstuff into homepagecleanup Skud 2012-09-24 21:30:24 +01:00
  • be9d20df0b Merge pull request #20 from Skud/fixfooters Skud 2012-09-24 13:25:33 -07:00
  • 2ae0a7ad16 Merge pull request #1 from pozorvlak/fixfooters Skud 2012-09-24 13:24:23 -07:00
  • 7728088c2e Merge pull request #19 from Skud/story4deploy pozorvlak 2012-09-24 13:20:32 -07:00
  • f6bc259c68 precompile assets after deploying Skud 2012-09-24 21:17:11 +01:00
  • 2c3945ffbe Merge pull request #18 from pozorvlak/heroku2 Skud 2012-09-24 13:09:54 -07:00
  • a2fede15e9 Don't connect to the DB when precompiling assets. Miles Gould 2012-09-17 22:55:27 +01:00
  • 387d68185d Wrap dev/test Rake tasks in error recovery Miles Gould 2012-09-17 22:50:08 +01:00
  • 7ef4a6784f fixed paragraph break, removed user signin stuff which is now in header Skud 2012-09-24 20:44:35 +01:00
  • ea3067ff36 Replace most of the HTML-in-HAML Miles Gould 2012-09-18 18:52:37 +01:00
  • a959d491e8 added comments to explain mix of HTML and HAML in header/footer fragments Skud 2012-09-17 18:24:49 +01:00
  • e2f035265a oops, don't need that HTML comment there Skud 2012-09-17 18:13:44 +01:00
  • 7edd3c5fe9 cleaned up interaction of HAML and foundation, broke out a new header fragment Skud 2012-09-17 18:13:16 +01:00
  • 3f38460273 Merge branch 'haml' of https://github.com/cesy/growstuff into dev Skud 2012-09-16 23:22:10 +01:00
  • 43570e5e8e fixed merge problems in Gemfile Skud 2012-09-16 23:20:19 +01:00
  • 9a5ea87ea0 Merge pull request #14 from Skud/story13zurb Skud 2012-09-15 03:42:24 -07:00
  • 4f40588435 fixed broken tests (mea culpa) Skud 2012-09-15 11:41:32 +01:00
  • 8570d4fd9a we should definitley be using compass-rails not compass Skud 2012-09-15 11:30:17 +01:00
  • 01a98bc90b Merge pull request #13 from Skud/story13zurb Skud 2012-09-15 03:18:12 -07:00
  • ae6ac886a3 Prettified index.html using zurb foundation Skud 2012-09-08 21:50:23 +01:00
  • 996d14ade8 i think this is everything for zurb. maybe. Skud 2012-09-08 19:21:00 +01:00
  • aeb9b5619b ran compass install to get foundation JS Skud 2012-09-08 18:52:43 +01:00
  • a0ef6dcb75 uhh, i don't even remember how this got added Skud 2012-09-04 23:52:20 +01:00
  • 927dc45147 i think i've got foundation working. maybe. Skud 2012-09-04 23:33:59 +01:00
  • ef9bf992d8 still trying to get zurb foundation working Skud 2012-09-04 22:57:44 +01:00
  • 6e0c7cf02c installed zurb, ran various rails g scripts from http://foundation.zurb.com/docs/gem-install.php#simple2 Skud 2012-09-04 17:32:54 +01:00
  • b06e9c44db Merge pull request #12 from Skud/story4deploy Skud 2012-09-15 02:48:39 -07:00
  • bc010f8e41 migrate db after deploying Skud 2012-09-15 10:47:21 +01:00
  • 8c8c796bc5 deploy now seems to be working Skud 2012-09-15 10:43:17 +01:00
  • 8cdd477745 fixing merge from upstream dev branch Skud 2012-09-15 10:24:56 +01:00
  • e2751a488c using cape to run rake tasks on dev server Skud 2012-09-15 10:22:51 +01:00
  • 4fa0eda475 go back to deploying this branch (not dev) for testing Skud 2012-09-15 09:54:16 +01:00
  • 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 Skud 2012-09-15 09:50:58 +01:00
  • 25a0c0caeb Finish Hamlifying Devise-generated views. Miles Gould 2012-09-14 23:47:49 +01:00
  • 6d8880da2a Test for presence of an unlock link. Miles Gould 2012-09-14 23:07:50 +01:00
  • 318a0afb35 HAMLify some pages. Miles Gould 2012-09-13 16:54:31 +01:00
  • 60add22a42 More pre-hamlification tests for views. Miles Gould 2012-09-13 16:40:50 +01:00
  • ddc3ae1f01 Don't repeat tests for all links in application spec. Miles Gould 2012-09-12 19:18:37 +01:00
  • 7bd0c36162 More unit tests for HAML Cesy Avon 2012-09-12 12:42:22 -07:00
  • 173aad7dea Adding tests in preparation for HAML Cesy Avon 2012-09-12 11:56:22 -07:00
  • 0c3bcbdb1e HAML-ify new session Cesy Avon 2012-09-12 11:52:38 -07:00
  • 4045b676f8 tweaked capistrano config to point to the actual dev branch Skud 2012-09-12 09:52:03 +01:00
  • e6c52527a7 removing line i previously commented out at passenger's suggestion Skud 2012-09-12 09:48:39 +01:00
  • bc9f6eea52 added compass to gemfile Skud 2012-09-12 09:41:30 +01:00
  • 75ca01188d commenting out 'unshift' line as recommended by error message from passenger' Skud 2012-09-12 09:23:49 +01:00
  • 802c762004 Test for email confirmation page. Miles Gould 2012-09-10 22:59:59 +01:00
  • f076438ef9 Test for footer. Miles Gould 2012-09-10 23:06:23 +01:00
  • 7111c9e2bc Fix extra paragraph break in index page. Miles Gould 2012-09-10 22:51:13 +01:00
  • 5d50bb9823 HAMLify the links in the footer. Miles Gould 2012-09-10 22:49:29 +01:00
  • 15ce32e786 Only stash unindexed changes if there are any. Miles Gould 2012-09-10 17:41:09 +01:00
  • bbcd272d1c Document CI setup in README. Miles Gould 2012-09-10 15:39:46 +01:00
  • b173aad6b7 Added pre-commit hook script to run spec tests. Miles Gould 2012-09-10 15:28:42 +01:00
  • bb3516b19c Use spork to run spec tests. Miles Gould 2012-09-10 14:46:04 +01:00
  • 40f111001c Add a "rake watchr" task. Miles Gould 2012-09-10 14:24:01 +01:00
  • 1e0545fe30 Use watchr to watch spec, rb, haml and erb files. Miles Gould 2012-09-10 14:14:45 +01:00
  • abcca8071c Add watchr to dev setup. Miles Gould 2012-09-10 13:57:50 +01:00
  • 31662884ab Only install test gems on dev machines. Miles Gould 2012-09-10 13:56:37 +01:00
  • c98c5c0d81 Merge pull request #9 from pozorvlak/add_haml Skud 2012-09-09 13:42:59 -07:00
  • 583d075ce5 Port passwords forms to HAML. Miles Gould 2012-09-09 21:20:50 +01:00
  • 3956d118fa Port index and application to HAML Miles Gould 2012-09-09 21:02:08 +01:00
  • aa2769cd9d Merge pull request #8 from pozorvlak/story14footer Skud 2012-09-09 13:18:55 -07:00
  • b109bdd0fa Story 14: links in footer. Miles Gould 2012-09-09 20:32:09 +01:00
  • c7e701ffe8 Merge pull request #7 from pozorvlak/story15description Skud 2012-09-09 12:17:36 -07:00
  • bfa783f462 Unify calls to "render" in spec tests. Miles Gould 2012-09-09 20:14:27 +01:00
  • 5aa3242104 Include project description on index page. Miles Gould 2012-09-09 20:07:07 +01:00
  • 1e907d4cb9 Fixing failing unit test and making rspec tests the default Cesy Avon 2012-09-07 06:09:48 -07:00
  • 0d2630ae21 tweaked bundler flags/paths/etc Skud 2012-09-06 18:36:18 +01:00
  • 2255542af2 re-added this config file Skud 2012-09-06 17:56:59 +01:00
  • 45b4ef4ded removing the setup_load_paths thing, at least temporarily, to see if this works any better. Skud 2012-09-06 17:48:31 +01:00
  • bb82b27cfa added rake to gemfile Skud 2012-09-06 17:31:52 +01:00
  • 02ce0e8ad0 added .rvmrc as per http://stackoverflow.com/questions/5680341/how-to-load-passenger-from-apache-with-rvm-and-unique-gem-sets Skud 2012-09-06 16:50:13 +01:00
  • d0c919acd5 attempting to get gemset working for deploy, see http://stackoverflow.com/questions/5680341/how-to-load-passenger-from-apache-with-rvm-and-unique-gem-sets Skud 2012-09-06 16:47:40 +01:00
  • b4d5f75dae added passenger gem for deployment Skud 2012-09-06 16:23:23 +01:00
  • c19d98a575 capistrano deployment files. almost working? Skud 2012-09-06 16:10:09 +01:00
  • 8f9c8e5b76 Merge pull request #5 from Skud/story6login Skud 2012-09-04 09:11:36 -07:00
  • a1a53de27f added mail settings for development environment Skud 2012-09-04 17:09:57 +01:00
  • 523d65e82c Merge pull request #4 from Skud/story6login Skud 2012-09-04 08:22:26 -07:00
  • 9792abbf87 made user accounts confirmable by email Skud 2012-09-03 13:16:24 +01:00
  • 1fe0cda804 generated rdoc Skud 2012-09-03 12:43:11 +01:00
  • dcd4f79bdc You can now login using either username or email Skud 2012-09-03 12:38:58 +01:00
  • b4ab40a2b3 added failing tests for logging in by username Skud 2012-09-03 12:27:57 +01:00
  • ada033ed87 added very basic tests for user model Skud 2012-09-03 12:26:09 +01:00
  • 321ee98d6e added rspec tests for index.html.erb when logged in Skud 2012-09-03 11:37:55 +01:00
  • 797846ffef added a simple rspec test for index.html.erb Skud 2012-09-03 11:21:07 +01:00
  • 89cb3c276f added devise and rspec, set up very basic login/signup links on homepage Skud 2012-09-03 10:49:45 +01:00
  • e019bf67dd Merge pull request #3 from cesy/devbasics Skud 2012-08-27 00:24:14 -07:00
  • 8190af434f Getting the basic site working Cesy Avon 2012-08-23 11:21:52 -07:00
  • 72b16c10cf Adding a home page Cesy Avon 2012-08-23 11:22:03 -07:00
  • 95145f2869 Moving development to top level directory Cesy Avon 2012-08-23 10:41:00 -07:00
  • 9cf506869c Added license (AGPLv3) Skud 2012-08-23 07:38:57 +01:00
  • cc09f008d2 Created default rails app Ricky Amianym 2012-08-22 00:09:45 -04:00
  • 736589709c Updating readme Cesy Avon 2012-08-17 14:12:29 -07:00
  • 391d1a84ef first commit Skud 2012-08-08 07:14:45 +02:00