mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-02 13:41:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,419 Commits 62 Branches 76 Tags
c76e9ccbf6ff41c192845c723ddc8690a74aede7
Commit Graph

1439 Commits

Author SHA1 Message Date
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
Mackenzie
7bca5c8845 Merge pull request #715 from Skud/requestcrops 
Improvements to crop requests
 2015-02-20 22:11:28 -05:00
Shiho Takagi
35f8c126b6 using scope for searching only approved records 2015-02-18 15:38:28 +11:00
Shiho Takagi
506e3e550c update sql search to excludes unapproved crops 2015-02-18 11:26:14 +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
Shiho Takagi
023333b15f exclude unapproved crops from search 2015-02-17 23:52:02 +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
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
Shiho Takagi
3ed7edbfbf merge 2015-02-12 21:09:42 +11:00
Shiho Takagi
e09f050088 updated the crop search query for more accurate search 2015-02-12 16:42:36 +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
Skud
66fcad69fa Paginate search results, make sexy subtitles 2015-02-10 20:48:36 +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
49a5a26f17 Functionality to sort members by recently joined : Issue #550 2015-02-09 17:47:25 +11:00
Mackenzie Morgan
b66b8263c1 resolving schema merge 2015-02-09 00:06:18 -05: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
Skud
f7a2ec2054 Merge pull request #676 from pozorvlak/seed_properties 
New seed properties: days until maturity, organic, GMO, heirloom
 2015-02-09 14:07:20 +11:00
Miles Gould
e6cbbb3e3d Use fieldset instead of abusing .input-group. 
As discussed in
https://github.com/Growstuff/growstuff/pull/676#issuecomment-73072087
and following comments by @maco and @Skud.
 2015-02-07 13:23:31 +00:00
robertlandreaux
b78ccaa097 fix crop_wrangling_button_spec.rb 2015-02-06 21:57:47 -05:00
robertlandreaux
593d6e7ec1 Merge branch 'dev' of https://github.com/Growstuff/growstuff into add-crop-wrangling-link 2015-02-06 21:29:18 -05:00
Taylor Griffin
a69ad34359 add link to search crops 2015-02-06 07:36:43 +11:00
Taylor Griffin
1099e4c9fe update copy for new / edit crop form 2015-02-06 07:34:01 +11:00
Taylor Griffin
076a6cc1df catch up with upstream dev 2015-02-04 21:41:42 +11:00
Taylor Griffin
b842bff9cb wip: fix misc tests 2015-02-04 18:36:14 +11:00
Taylor Griffin
80a28085f1 make pending crops unviewable to regular members 2015-02-04 14:44:12 +11:00
Taylor Griffin
0dd8cbccf0 refactor default scope on crop 2015-02-04 14:21:35 +11:00
Taylor Griffin
abece6473b make rejected and pending crops viewable on wrangle crops page 2015-02-04 14:18:10 +11:00
Taylor Griffin
ff1b941690 validate that a crop hasn't already been rejected or approved 2015-02-04 06:56:51 +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
075cdb8272 Merge branch 'dev' of github.com:growstuff/growstuff into cms 2015-02-02 23:11:51 -05:00