Brenda Wallace
|
d55af1b77d
|
Fix droppdown/dropup menus
|
2019-05-17 11:53:32 +12:00 |
|
Brenda Wallace
|
4c0bca4b86
|
Removing isotope
we don't need it anymore
|
2019-05-17 09:49:57 +12:00 |
|
Brenda Wallace
|
f5f5ecdea7
|
Merge remote-tracking branch 'upstream/dev' into material-merge
Conflicts:
Gemfile.lock
app/assets/javascripts/application.js
app/assets/stylesheets/application.sass
app/assets/stylesheets/plantings.sass
app/views/crops/_thumbnail.html.haml
app/views/crops/show.html.haml
app/views/home/_members.html.haml
app/views/layouts/application.html.haml
app/views/photos/show.html.haml
app/views/plantings/_descendants.html.haml
app/views/plantings/show.html.haml
app/views/seeds/_thumbnail.html.haml
app/views/shared/_global_actions.html.haml
spec/models/crop_spec.rb
|
2019-04-21 11:27:27 +12:00 |
|
Brenda Wallace
|
27d12bf07e
|
Isotope making nice layout on plantings#show
|
2019-04-20 09:09:07 +12:00 |
|
Brenda Wallace
|
3ed173ebcd
|
Material design changes
|
2019-02-17 21:33:36 +13:00 |
|
Brenda Wallace
|
fa32537c3b
|
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
Conflicts:
.rubocop_todo.yml
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/members.js.erb
app/assets/stylesheets/predictions.sass
app/controllers/crops_controller.rb
app/controllers/orders_controller.rb
app/controllers/plantings_controller.rb
app/models/account.rb
app/models/account_type.rb
app/models/member.rb
app/models/order.rb
app/models/order_item.rb
app/models/product.rb
app/views/gardens/show.html.haml
app/views/layouts/application.html.haml
config/initializers/assets.rb
config/routes.rb
db/schema.rb
package-lock.json
spec/controllers/account_types_controller_spec.rb
spec/controllers/admin/orders_controller_spec.rb
spec/controllers/comments_controller_spec.rb
spec/controllers/gardens_controller_spec.rb
spec/controllers/harvests_controller_spec.rb
spec/controllers/member_controller_spec.rb
spec/controllers/order_items_controller_spec.rb
spec/controllers/orders_controller_spec.rb
spec/controllers/photo_associations_controller_spec.rb
spec/controllers/photos_controller_spec.rb
spec/controllers/plantings_controller_spec.rb
spec/controllers/seeds_controller_spec.rb
spec/controllers/shop_controller_spec.rb
spec/features/crops/crop_detail_page_spec.rb
spec/models/member_spec.rb
spec/models/post_spec.rb
spec/views/crops/_planting_advice.html.haml_spec.rb
spec/views/home/_crops.html.haml_spec.rb
spec/views/orders/show.html.haml_spec.rb
spec/views/posts/show.html.haml_spec.rb
spec/views/shop/index_spec.rb
|
2018-04-02 10:59:13 +12:00 |
|
Brenda Wallace
|
86b9a3650b
|
Move application.js loading last again
|
2018-01-23 09:00:34 +13:00 |
|
Brenda Wallace
|
b1096cd021
|
Moved chart includes to application.js, attempting to fix json parse error
|
2018-01-23 09:00:34 +13:00 |
|
Brenda Wallace
|
61408d7e4e
|
Some js cleanups
|
2018-01-23 09:00:34 +13:00 |
|
Brenda Wallace
|
6d56f3f655
|
Merge branch 'charts' into upgrade/rails-5
Conflicts:
app/views/layouts/application.html.haml
|
2018-01-09 15:55:28 +13:00 |
|
Brenda Wallace
|
74ff648f90
|
Moved chart includes to application.js, attempting to fix json parse error
|
2018-01-09 12:51:21 +13:00 |
|
Brenda Wallace
|
641d227a87
|
Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
Conflicts:
app/assets/javascripts/application.js
package-lock.json
|
2018-01-06 08:46:52 +13:00 |
|
Brenda Wallace
|
2fd13e9b7c
|
Updated new path to jquery autocomplete
|
2018-01-04 14:44:52 +13:00 |
|
Brenda Wallace
|
5584da02c3
|
Some js cleanups
|
2018-01-03 12:35:30 +13:00 |
|
Mackenzie Morgan
|
8659ebca2d
|
switch from less to sass
* dependency hell + bit rot on upstream libraries prevents installation on OS X
|
2016-05-19 15:52:54 -04:00 |
|
Taylor Griffin
|
868e5c2079
|
upgrade jquery-ui-rails gem and config
|
2014-11-16 12:41:57 +11:00 |
|
Taylor Griffin
|
8a1dd9d171
|
implement autocomplete for crop name on new planting form
|
2014-07-26 20:16:22 +10:00 |
|
Skud
|
c02772d219
|
Spike: use pure javascript and JSON API to draw map
|
2013-09-09 22:15:47 +10:00 |
|
Ryan Clark
|
fe00146f22
|
Added map to places/index
|
2013-08-06 19:38:11 -07:00 |
|
Miles Gould
|
7430dfc25e
|
Tried to use Bootstrap datepicker. Failed!
We get the Javascript error "datepicker is not a function".
|
2013-03-26 19:27:45 +11:00 |
|
Miles Gould
|
26e4699812
|
Merged "bootstrap".
|
2012-11-15 23:22:40 +00:00 |
|
Skud
|
ef9bf992d8
|
still trying to get zurb foundation working
|
2012-09-15 11:11:11 +01:00 |
|
Skud
|
6e0c7cf02c
|
installed zurb, ran various rails g scripts from http://foundation.zurb.com/docs/gem-install.php#simple2
|
2012-09-15 11:11:11 +01:00 |
|
Cesy Avon
|
95145f2869
|
Moving development to top level directory
|
2012-08-23 10:41:00 -07:00 |
|