raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-03 06:59:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'api_fixes' into bom

Browse Source
This commit is contained in:
Rob H
2014-04-23 12:03:01 +10:00
parent 2532248e6f 669ec0eee7
commit b37a701d39
62 changed files with 775 additions and 2282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/all.js
View File

@@ -9,8 +9,8 @@
//= require jquery_ujs
//= require jquery-ui
//= require shared/jquery-ui-timepicker-addon
//= require shared/angular
//= require shared/angular-resource
//= require angular
//= require angular-resource
//= require admin/spree_core
//= require admin/spree_auth
//= require admin/spree_promo

2
app/assets/javascripts/admin/bulk_order_management.js.coffee
View File

@@ -350,4 +350,4 @@ formatTime = (date) ->
twoDigitNumber = (number) ->
twoDigits = "" + number
twoDigits = ("0" + number) if number < 10
twoDigits
twoDigits

2
app/assets/javascripts/admin/order_cycle.js.erb.coffee
View File

@@ -419,4 +419,4 @@ angular.module('order_cycle', ['ngResource'])
if !$(this).is(':checked')
scope.$apply ->
scope.removeDistributionOfVariant(attrs.ofnSyncDistributions)
)
)