Marlena Compton
|
6e4bb58dfd
|
change color when hovering over a bar
|
2015-02-26 06:26:38 -08:00 |
|
Marlena Compton
|
66b0f139a9
|
add tooltip to show data values
|
2015-02-26 06:07:23 -08: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 |
|
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
|
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 |
|
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 |
|
Skud
|
497121a221
|
Merge pull request #695 from sksavant/member_sort
Functionality to sort members by recently joined : Issue #550
|
2015-02-09 17:53:11 +11:00 |
|
Savant Krishna
|
e17a3a2ab1
|
Addition to Contributors list
|
2015-02-09 17:47:31 +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 |
|
Skud
|
95ecdad024
|
Merge pull request #650 from robertlandreaux/add-crop-wrangling-link
add wrangle crop button to browse crops page
|
2015-02-09 14:06:28 +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 |
|
Skud
|
4c6b96e590
|
Merge pull request #687 from tygriffin/crop-request
Crop request
|
2015-02-06 13:55:08 +11:00 |
|
Taylor Griffin
|
8631c78f9a
|
Merge branch 'dev' of https://github.com/Growstuff/growstuff into crop-request
|
2015-02-06 07:36:52 +11: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 |
|
Skud
|
3a53f4f8a8
|
Merge pull request #686 from yoongkang/mydev
Allow the planting reminder spec to test links in emails properly
|
2015-02-05 13:53:17 +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 |
|
Skud
|
85a6eb6195
|
Merge pull request #693 from maco/standard_weights
make the one-off save the si weight
|
2015-02-03 20:10:37 +11:00 |
|
Mackenzie Morgan
|
87bfceb035
|
make the one-off save the si weight
|
2015-02-02 23:49:07 -05: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 |
|
Taylor Griffin
|
7db4dee61a
|
add alert on crop show when rejected
|
2015-02-03 13:30:21 +11:00 |
|
Taylor Griffin
|
0993917dc6
|
define approval status options in model
|
2015-02-03 13:28:44 +11:00 |
|
Taylor Griffin
|
d6cb20e2c4
|
make reasons for rejection a select input
|
2015-02-03 13:27:41 +11:00 |
|
Taylor Griffin
|
3e65656c7b
|
add meta data to crop pending alert
|
2015-02-03 13:25:14 +11:00 |
|