mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-04 14:20:12 -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
Shiho Takagi
375f647e2d Merge branch 'dev' of https://github.com/Growstuff/growstuff into 575-one-click-email-unsubscribe 2015-02-25 16:50:30 +11:00
Mackenzie Morgan
1b62c5cb97 remove pending/rejected crops from browse and test that, change links on wrangling page to go directly to crop edit and update tests for that 2015-02-25 00:05:56 -05:00
Shiho Takagi
0f52ea5aad one click unsubscription 2015-02-25 10:26:04 +11:00
Cesy Avon
2740b5e47b Correcting the environment variable name for secret token so Heroku is not impacted 2015-02-23 13:37:43 +00:00
Shiho Takagi
3894127f5c Merge branch 'dev' of https://github.com/Growstuff/growstuff into 629-thumbnails-of-crops-on-post 2015-02-23 21:44:01 +11:00
Shiho Takagi
17ccea4b28 moving photo on posts/show view 2015-02-23 21:43:03 +11:00
Mackenzie
7bca5c8845 Merge pull request #715 from Skud/requestcrops 
Improvements to crop requests
 2015-02-20 22:11:28 -05:00
Mackenzie
017df0484c Merge pull request #716 from oshiho3/PT80956846_crop_search 
exclude unapproved crops from search
 2015-02-20 22:04:53 -05:00
Shiho Takagi
d338bab82b travis to test both with and without elasticsearch 2015-02-18 16:18:24 +11:00
Shiho Takagi
35f8c126b6 using scope for searching only approved records 2015-02-18 15:38:28 +11:00
Shiho Takagi
eafe90e295 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-18 11:37:30 +11:00
Shiho Takagi
7b911034b8 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-18 11:37:11 +11:00
Shiho Takagi
798b89db11 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-18 11:36:21 +11:00
Shiho Takagi
506e3e550c update sql search to excludes unapproved crops 2015-02-18 11:26:14 +11:00
Shiho Takagi
8ab3167a28 update sql search to excludes unapproved crops 2015-02-18 11:15:15 +11:00
Shiho Takagi
436e7e3c59 Merge branch 'dev' of https://github.com/Growstuff/growstuff into PT80956846_crop_search 2015-02-18 10:33:48 +11:00
Skud
9f1091a1c8 Merge pull request #717 from maco/cms 
change footer section names to generic footer1, footer2, footer3
 2015-02-18 08:20:58 +11:00
Mackenzie Morgan
3b1e855da3 change footer section names to generic footer1, footer2, footer3 because we're going to CMS mode 2015-02-17 13:51:06 -05:00
Savant Krishna
da95581099 :using size instead of count 2015-02-17 21:35:57 +05:30
Mackenzie
d7f8bff17a Merge pull request #714 from Skud/search_tweaks 
Fixed various problems with searches
 2015-02-17 09:15:25 -05:00
Shiho Takagi
a7caa2fbaa Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-18 00:49:21 +11:00
Shiho Takagi
b215ef03c7 Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-18 00:47:46 +11:00
Shiho Takagi
3cbbbc79fb Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-18 00:39:56 +11:00
Shiho Takagi
eb5e9e926b fixing Travis CI error 2015-02-18 00:37:58 +11:00
Shiho Takagi
ef2d1eb683 fixing Travis CI error 2015-02-18 00:17:53 +11:00
Shiho Takagi
965f87393d Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 
Conflicts:
	spec/models/crop_spec.rb
 2015-02-17 23:56:26 +11:00
Shiho Takagi
023333b15f exclude unapproved crops from search 2015-02-17 23:52:02 +11:00
Shiho Takagi
2241a760c2 exclude unapproved crops from search 2015-02-17 23:33:39 +11:00
Skud
e4dabd1725 Fix action links in sidebar - can't do stuff if not approved 2015-02-17 20:54:16 +11:00
Skud
1dfac3fb2f Improving crop request form 2015-02-17 20:44:24 +11:00
Skud
d0f856d389 Fixed various problems with search matching 2015-02-17 19:20:25 +11:00
Mackenzie
ac6aa730c1 Merge pull request #711 from maco/cms 
move cms admin to /admin/cms at skud's request
 2015-02-17 00:30:38 -05:00
Mackenzie Morgan
cd12412b46 move cms admin to /admin/cms at skud's request 2015-02-16 23:19:25 -05:00
Miles Gould
9e146cde18 Merge branch 'dev' into js_all_the_features 2015-02-16 14:42:30 +00:00
Cesy Avon
9b195d1d2e Fixing line break 2015-02-16 13:42:57 +00:00
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
Cesy Avon
6f80102f79 Adding autoloaded crop factory for later testing 2015-02-16 12:27:18 +00:00
Shiho Takagi
90ca5ec13b added thumbnails of crops mentioned on post page 2015-02-13 23:39:31 +11:00
Taylor Griffin
28288c51fe Merge pull request #707 from oshiho3/PT80956846_crop_search 
fixing issue with 1)paginating crop search and 2)crop name autocomplete
 2015-02-13 06:11:29 +11:00
Shiho Takagi
70cdab96c4 fixing issue with 1)paginating crop search and 2)crop name autocomplete 2015-02-12 23:00:04 +11:00
Taylor Griffin
e906d293a2 Merge pull request #702 from tygriffin/request-crop-links 
Request crop links
 2015-02-12 22:25:54 +11:00
Taylor Griffin
abdc43ef40 Merge pull request #705 from oshiho3/PT80956846_crop_search 
Fixes and improvement
 2015-02-12 22:25:08 +11:00
Shiho Takagi
3ed7edbfbf merge 2015-02-12 21:09:42 +11:00
Taylor Griffin
95974ab21b add deprecation not to all controller and view specs 2015-02-12 19:52:53 +11:00
Shiho Takagi
7e9f18e89e Merge branch 'PT80956846_crop_search' of https://github.com/oshiho3/growstuff into PT80956846_crop_search 2015-02-12 16:42:55 +11:00
Shiho Takagi
e09f050088 updated the crop search query for more accurate search 2015-02-12 16:42:36 +11:00
Shiho Takagi
5bfab90b5b updated the crop search query for more accurate search 2015-02-12 16:31:57 +11:00
Nell Taylor & Heejin Park
7a064c0667 Added 'current' scope to show only current plantings on gardens/index view and added accompanying view test 2015-02-10 15:02:10 -06:00
Marlena Compton
567562f132 fix merge conflicts in gemfile.lock 2015-02-10 06:44:22 -08:00
Marlena Compton
39feeb94d0 merge in changes from dev branch 2015-02-10 06:28:47 -08:00