 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 |
|
|
Yoong Kang Lim
|
75ac2081b0
|
Merge branch 'dev' into likeable
Conflicts:
db/schema.rb
|
2015-02-10 22:57:28 +11:00 |
|
|
Yoong Kang Lim
|
36a94156c1
|
Merge branch 'dev' into likeable
Conflicts:
db/schema.rb
|
2015-02-10 22:54:45 +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 |
|
|
Skud
|
09a78d4661
|
Merge pull request #701 from Skud/search_tweaks
Search tweaks
|
2015-02-10 20:57:32 +11:00 |
|
|
Skud
|
e0d8126514
|
Merge pull request #694 from maco/cms
Add comfortable mexican sofa CMS to growstuff & make footer use it
|
2015-02-10 20:53:50 +11:00 |
|
|
Savant Krishna
|
1c9081e788
|
remove duplicate test in views
|
2015-02-10 20:52:42 +11:00 |
|
|
Skud
|
5cceb2c4ff
|
Merge pull request #699 from tygriffin/fix-request-new-crop
Fix request new crop
|
2015-02-10 20:52:37 +11:00 |
|
|
Skud
|
66fcad69fa
|
Paginate search results, make sexy subtitles
|
2015-02-10 20:48:36 +11:00 |
|
|
Yoong Kang Lim
|
e3db003bbc
|
Added tests for the concern and member model
|
2015-02-10 20:18:26 +11:00 |
|
|
Savant Krishna
|
9bcd2d0aa6
|
Test for linkback of photos to harvest/garden/planting
|
2015-02-10 20:01:43 +11:00 |
|
|
Taylor Griffin
|
2ab73d3df6
|
call site name from inside signature partial
|
2015-02-10 19:59:42 +11:00 |
|
|
Taylor Griffin
|
623dbdd418
|
fix search deleting crops
|
2015-02-10 19:58:43 +11:00 |
|
|
Skud
|
78c4fc36b1
|
Paginate search results
... and include total number in subtitle
|
2015-02-10 19:26:07 +11:00 |
|
|
Skud
|
9ccef5471f
|
Added search form to crop search result page
|
2015-02-10 19:18:57 +11:00 |
|
|
Skud
|
0fc4c3cb4d
|
Made search result page show a suitable title
|
2015-02-10 19:07:50 +11:00 |
|
|
Taylor Griffin
|
c61f7b8e72
|
pass locals into signature partial properly
|
2015-02-10 18:52:24 +11:00 |
|
|
Taylor Griffin
|
b81e034254
|
tweak permissions for alternate names just like sci names
|
2015-02-10 18:38:32 +11:00 |
|
|
Taylor Griffin
|
07f7572b13
|
extract email signature into partial
|
2015-02-10 18:33:54 +11:00 |
|
|
Taylor Griffin
|
2697fea249
|
tests back to green
|
2015-02-09 22:41:35 +11:00 |
|
|
Taylor Griffin
|
cbb4f9d7ac
|
add rejection notes
|
2015-02-09 22:17:32 +11:00 |
|
|
Taylor Griffin
|
0dbc2e1964
|
prevent users from seeing sci names of crops unless approved
|
2015-02-09 21:52:52 +11:00 |
|
|
Taylor Griffin
|
319fc12ebb
|
add crop must be approved validation
|
2015-02-09 21:13:25 +11:00 |
|
|
Taylor Griffin
|
2db7bf638b
|
improve copy for new request email
|
2015-02-09 20:41:28 +11:00 |
|
|
Savant Krishna
|
36a9514add
|
linkback for harvests and gardens as well : Fixing #679
|
2015-02-09 17:59:31 +11:00 |
|