mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 06:12:41 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 63 Branches 82 Tags
Layout/HashAlignment
Commit Graph

11959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miles Gould
a5edb6497c Display lack-of-posts nicely on crop page. 2015-01-11 12:08:57 +00:00
Miles Gould
d6314ea9a1 SEO: add crop name everywhere 2015-01-11 12:08:57 +00:00
Miles Gould
c244ca672f Add tests for SEO of crop detail page 2015-01-11 12:08:57 +00:00
Miles Gould
401777cc4c Add some irregular plurals. 2015-01-11 12:02:02 +00:00
Miles Gould
7ef8afb1ba Tests for crop inflections 2015-01-11 12:02:02 +00:00
Miles Gould
e25bb5578a Remove extraneous authentication routes. 2015-01-11 11:57:13 +00:00
Miles Gould
401f3e176e Remove the authentications index page 2015-01-11 11:57:13 +00:00
Taylor Griffin
10ae117914 Merge pull request #451 from tygriffin/rails4-upgrade 
Rails4 upgrade
 2015-01-11 21:12:44 +11:00
Taylor Griffin
86cea2ad9f add current_password to permitted params 2015-01-11 14:55:12 +11:00
Taylor Griffin
ccef46a5cf add more permitted parameters to member update 2015-01-11 14:32:19 +11:00
Taylor Griffin
c803da3dfa fix planted_at on planting create bug 2015-01-11 14:00:51 +11:00
Taylor Griffin
02ff45f705 broaden seeding for staging env 2015-01-11 09:41:04 +11:00
Taylor Griffin
8a05a959c3 remove depricated method 2015-01-10 15:46:36 +11:00
Taylor Griffin
e5d407b1ce replace depricated method 2015-01-10 15:35:54 +11:00
Taylor Griffin
5cd53be5be change post route to get per omniauth docs 2015-01-10 14:59:04 +11:00
Taylor Griffin
c6cc8ee6bb configure devise account update for strong parameters 2014-12-31 18:32:37 +11:00
Marlena Compton
e52c4f7d4b add group for graph and transform to accommodate labels 2014-12-22 10:24:33 -08:00
Taylor Griffin
eaf4ea04ac Merge branch 'dev' of https://github.com/Growstuff/growstuff into rails4-upgrade 2014-12-20 20:45:13 +11:00
Taylor Griffin
007f7112a7 replaced caching using observers with a key-based (and simplified) caching system 2014-12-19 21:17:43 +11:00
Skud
9d49a83918 Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev 2014-12-17 17:34:42 +11:00
Skud
901fed7d35 Added non-code contribution tips 2014-12-17 17:34:18 +11:00
Skud
6deb0c659a Removed references to PT 2014-12-17 17:34:06 +11:00
Taylor Griffin
f62fd8484a get rid of annoying warning about doubly loaded files when running tests 2014-12-15 21:13:22 +11:00
Taylor Griffin
849bdac81b include module that holds expire_fragment method 2014-12-15 21:02:44 +11:00
Taylor Griffin
c1d2f2c9cc resolve conflicts 2014-12-15 07:17:11 +11:00
Marlena Compton
5f435b1e82 fix conflict in contributors file 2014-12-14 10:15:05 -08:00
Taylor Griffin
d92d22d99c include ActionController::Caching in Sweeper class 2014-12-14 21:03:10 +11:00
Taylor Griffin
8829acba3f removed depricated method 2014-12-14 15:54:43 +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
cdaa9c03a2 Merge branch 'rails4-upgrade' 2014-12-14 14:51:36 +11:00
Taylor Griffin
a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Taylor Griffin
0afd9dfbe2 Merge pull request #608 from pozorvlak/libv8_fix 
Fix problems installing libv8 on OS X.
 2014-12-14 12:08:01 +11:00
Miles Gould
c446ea9232 Upgrade libv8 to v3.16.14.7. 
The old version was breaking `bundle install` on OS X.
 2014-12-13 11:56:18 +00:00
Miles Gould
43c241219d Update .ruby-version to match Gemfile. 2014-12-13 11:56:18 +00:00
Marlena Compton
f608685ac8 add names to contributors 2014-12-12 13:36:11 -08:00
Skud
77e424c412 Merge branch 'juzham-facebook_button' into dev 2014-12-13 08:26:22 +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
Taylor Griffin
314cdc687a precompiled assets 2014-12-12 22:00:30 +11:00
Taylor Griffin
df3b300967 remove '/assets' from references to assets 2014-12-12 21:31:22 +11:00
Skud
b520f9e78b Update CONTRIBUTORS.md 
Removed duplicate contributor
 2014-12-12 18:43:42 +11:00
Skud
b7d9924fa7 Merge pull request #462 from kevieyang/upgrade_ruby_version 
Modified ruby from 2.1.2 to 2.1.5
 2014-12-10 08:49:15 +11:00
Skud
ea41021ae8 Merge pull request #463 from yoongkang/cancanredirect 
Fix for redirect sign-in not working for all models
 2014-12-10 08:48:31 +11:00
Kevin Yang
7f88157696 removed whitespace 2014-12-09 14:11:29 +00:00
Yoong Kang Lim
a69210ae6b Explicitly add spec for notification 2014-12-09 22:07:41 +11:00
Yoong Kang Lim
de26dd3708 to_s not needed 2014-12-09 21:42:17 +11:00
Yoong Kang Lim
2fc6bfb77f Merge remote-tracking branch 'upstream/dev' into cancanredirect 2014-12-09 21:32:01 +11:00