mirror/growstuff
1
0 Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-11-04 12:12:48 -05:00
Code Issues Packages Projects Releases Wiki Activity
13,034 Commits 96 Branches 96 Tags
8e3814e615dd409ded29a341d03237fcaa4e94de
Commit Graph
814 Commits
Author SHA1 Message Date
Cesy Avon eb76db93e4 Switching to new secrets format as per http://guides.rubyonrails.org/upgrading_ruby_on_rails.html#config-secrets-yml 2015-02-16 13:34:37 +00:00
Yoong Kang Lim 75ac2081b0 Merge branch 'dev' into likeable 
Conflicts:
	db/schema.rb
 2015-02-10 22:57:28 +11:00
Taylor Griffin 3289e7b950 Merge branch 'dev' of https://github.com/Growstuff/growstuff into fix-request-new-crop 2015-02-10 22:12:40 +11:00
Taylor Griffin 102763f2ab link to new crop request form 2015-02-10 22:12:22 +11:00
Mackenzie Morgan c3429cc0f3 adding admin access test for cms, and changing the cms admin path, and adding a link for it to the admin page, and updating the navbar so i can actually target the sign-in link in the test. also removing sample fixture gencode from cms installation 2015-02-09 00:05:02 -05:00
Yoong Kang Lim 33a66dce1f Starting stages of a like feature for posts. 2015-02-05 00:54:31 +11:00
Mackenzie Morgan b95975d632 swap footer over to CMS snippets and set CMS to use Devise for auth 2015-02-02 23:47:53 -05:00
Mackenzie Morgan 1f23e1a646 merge from upstream 2015-02-01 22:08:28 -05:00
Mackenzie Morgan 7326acba81 add cms routes 2015-02-01 21:56:06 -05:00
Mackenzie Morgan 6aa37e6e26 adding CMS via comfortable mexican sofa gem 2015-02-01 00:27:04 -05:00
Shiho Takagi 2aa30475e9 merge 2015-02-01 00:14:52 +11:00
Taylor Griffin 2f05f1dbdb raise exceptions on unpermitted params in staging 2015-01-23 13:22:52 +11:00
Taylor Griffin 0e0c309c15 Revert "Sci names permitted params" 2015-01-23 11:42:42 +11:00
Taylor Griffin 20b9996f14 raise exceptions on unpermitted parameters in staging 2015-01-23 10:15:06 +11:00
Shiho Takagi 018b2b4711 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:47:22 +11:00
Skud b114ed2414 Improved sitewide footer (fixes #526) 2015-01-13 20:07:59 +11:00
Skud 1064f39020 Merge pull request #626 from pozorvlak/authentications_page_die_die_die 
Remove authentications page and extraneous routes
 2015-01-13 10:39:06 +11:00
Miles Gould 401777cc4c Add some irregular plurals. 2015-01-11 12:02:02 +00:00
Miles Gould e25bb5578a Remove extraneous authentication routes. 2015-01-11 11:57:13 +00:00
Taylor Griffin 5cd53be5be change post route to get per omniauth docs 2015-01-10 14:59:04 +11:00
Taylor Griffin 66c4a19ad6 revert to previous smtp settings 2014-12-14 15:41:29 +11:00
Taylor Griffin a65b78084f change staging smtp settings 2014-12-14 15:36:56 +11:00
Taylor Griffin a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Skud 82b70cf893 Merge branch 'facebook_button' of https://github.com/juzham/growstuff into juzham-facebook_button 
Conflicts:
	CONTRIBUTORS.md
 2014-12-13 08:26:07 +11:00
Justin Hamman 6b0a298fd1 modified order and text for Facebook 2014-12-12 23:33:53 +11:00
Justin Hamman 78c6220262 updated the homepage to include a facebook icon. Updated all 'keep in touch' icons to be clickable and open new browser windows 2014-12-12 22:56:50 +11:00
Justin Hamman 6f2fa1b72b add facebook test 2014-12-12 22:27:52 +11:00
Yoong Kang Lim 27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Taylor Griffin c83b01bbb7 catch up with dev 2014-11-18 22:59:43 +11:00
Taylor Griffin fb595de457 edited configuration and dependencies 2014-11-18 22:24:58 +11:00
Taylor Griffin acbd3f9a9e implement strong parameters instead of protected attributes 2014-11-18 20:08:54 +11:00
Taylor Griffin 98c1680138 handle misc deprications 2014-11-17 07:16:02 +11:00
Taylor Griffin 0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Skud 93e468876d Remove old capistrano stuff, as we don't use it anymore 2014-11-16 10:17:22 +11:00
Skud 52cfa9f676 Changed staging environment hostname to staging.growstuff.org 2014-11-16 10:16:34 +11:00
Taylor Griffin 8e79199766 wip: upgrading rspec 2014-11-15 22:55:37 +11:00
Taylor Griffin 40a88b5b09 tests run but fail like whoa 2014-11-15 21:44:55 +11:00
Skud bfce66a8f7 Increase devise timeout to 30 days 2014-11-13 11:28:14 +11:00
Yoong Kang Lim b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +11:00
Yoong Kang Lim cacc002a01 Added follow/unfollow buttons 2014-11-12 01:47:26 +11:00
Yoong Kang Lim a9fdab5d7c Basic follower relationship 2014-11-12 00:23:01 +11:00
pozorvlak 24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00:00
Miles Gould 6921119301 Make Capybara actually hit the server. 
Background:
http://talk.growstuff.org/t/mysteriously-broken-feature-tests/120

@oshiho3's suggested fix didn't work, so I tried all the suggestions at
http://stackoverflow.com/questions/6536503/capybara-with-subdomains-default-host
until I found one that fixed the problem.
 2014-11-02 22:21:32 +00:00
Taylor Griffin c244da8b73 make English fallback language 2014-10-21 07:24:08 +11:00
Taylor Griffin 0e11f20910 Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n 2014-10-20 21:27:59 +11:00
Taylor Griffin ab449a65f8 remove 'to be translated' message from ja locale file 2014-10-20 21:27:39 +11:00
Skud a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile 
Conflicts:
	app/views/scientific_names/index.html.haml
 2014-10-19 16:54:10 +01:00
Skud 7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
Skud dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Miles Gould 7e4b51d1cb Add "Edit" link for alternate names on crops page. 2014-10-18 15:18:23 +01:00