raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,037 Commits 18 Branches 452 Tags
3760a34b2ba66f6e5bc615af8d41eb861219d97a
Commit Graph

2722 Commits

Author SHA1 Message Date
Bing Xie
78b4a35d12 Keep the action with save button 2016-05-12 10:45:41 +10:00
Bing Xie
2214c83ec7 Use save_bar on order cycle update form 2016-05-12 10:45:41 +10:00
Bing Xie
38efa218d0 Use save bar on order cycle form 2016-05-12 10:45:41 +10:00
Continuous Integration
f90e7d3239 Merge remote-tracking branch 'origin/master' into HEAD 2016-05-06 13:58:37 +10:00
Rohan Mitchell
a11696b85e Include BugHerd script only if configured, and with configured API key 2016-05-04 12:13:03 +10:00
Maikel Linke
4d6a21254f Merge remote-tracking branch 'origin/master' into openstreetmap-tiles 2016-04-29 16:40:54 +10:00
Maikel Linke
fa5fa9e228 Auto-complete tags on customers page 
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
 2016-04-29 15:18:17 +10:00
Rohan Mitchell
36a4aab020 Adjust styling to blend 2016-04-29 15:07:55 +10:00
Rohan Mitchell
42a327211e Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles 2016-04-29 14:36:47 +10:00
Rohan Mitchell
88e9eb59cf Do not allow invalid quantity to reach model, triggering server update 2016-04-29 11:56:48 +10:00
Rohan Mitchell
1384140e41 Notify when stock limit reached on cart rather than silently capping 2016-04-27 15:10:54 +10:00
Bing Xie
824a29624f Tweak the map UI 2016-04-27 14:17:29 +10:00
Bing Xie
daa5b00a2a Uses openstreetmap tiles 2016-04-27 13:50:15 +10:00
Rohan Mitchell
36f4df2931 Allow max value in cart of what's on hand 2016-04-27 12:27:24 +10:00
Rohan Mitchell
cf40e0432a When cart is updated with insufficient stock, show amount in cart, not amount entered 2016-04-27 12:27:24 +10:00
Steve Pettitt
53d50f16d6 Merge current master 2016-04-26 03:18:27 +01:00
Maikel
7bec139987 Auto-merged master into products-caching-add-to-cart on deployment. 2016-04-22 10:58:26 +10:00
Rob Harrington
28d40bf27d Fixing font styling on enterprise name in shop product summary 2016-04-21 21:27:52 +10:00
Rohan Mitchell
cfe062918b When a variant goes out of stock, disable the input and grey out the row 2016-04-21 09:36:23 +10:00
Steve Pettitt
0b820361de Merge master 2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3 Add failed payments, update spec 2016-04-15 08:26:12 +01:00
Maikel Linke
831df0b222 Create and delete customers in admin interface 
Removed Customers service and extended CustomerResource.
 2016-04-15 11:12:22 +10:00
Maikel Linke
9e4610f9bd Customers: enable change of hub if no customers 
Fix #588.

And show search bar even when no customers are shown. Previously, the
search bar disappeared when you entered a search without results.
 2016-04-15 11:12:22 +10:00
elf Pavlik
f15e948085 small i18n fixes #878 2016-04-14 16:10:21 -05:00
Steve Pettitt
1483023769 Add a sweet warning sign 2016-04-10 22:48:38 +01:00
Steve Pettitt
bc048a943c Show all payments, format unsuccessful payments grey, add 'invalid' translation. 2016-04-10 22:23:39 +01:00
Rob Harrington
44077a2c6f Fixing styling (bottom margin for save-bar) on inventory page 2016-04-06 15:43:55 +10:00
Rob Harrington
d278b72289 Updating Tag Rules UI to allow management of new FilterShippingMethods rule type 2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e Renaming shippingMethodCtrl to shippingMethodsCtrl 2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b Tag Rules can be deleted 2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf Enterprise users can create tag rules 2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f First cut at an interface for updating tag rules 2016-04-01 19:48:25 +11:00
Maikel Linke
97bcbb81b9 Change text of register call in the dropdown 
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
 2016-04-01 14:39:43 +11:00
Maikel Linke
04f661f646 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops 
Conflicts:
	config/locales/en.yml
 2016-04-01 13:02:53 +11:00
Maikel Linke
c4f92fd4cc Hide closed shops by default, add "show" button 2016-04-01 11:45:24 +11:00
Maikel Linke
813dff8af2 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login 2016-04-01 11:04:36 +11:00
Maikel Linke
db0b345241 Add "Show all on map" button under shops 2016-03-31 15:24:43 +11:00
Maikel Linke
21be27d722 Remove duplicate filtering of visible enterprises 
Increase readability of enterprises_controller.js.coffee.
 2016-03-31 15:00:22 +11:00
Maikel Linke
17f168ed06 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances 
Applied code conventions.

Conflicts:
	config/locales/en.yml
 2016-03-30 13:30:44 +11:00
stveep
d67db76b88 Formatting credit/debit green/red 2016-03-28 20:35:14 +01:00
Maikel Linke
5149c5118b Change text and style for shops requiring login 2016-03-24 21:42:21 +11:00
Maikel Linke
df36386757 Require customer instead of user 
If a shop requires a login, then a customer needs to be logged in, not
just any user.
 2016-03-24 18:24:46 +11:00
Maikel
d51cfccd7e Auto-merged master into i18n-hackathon on deployment. 2016-03-23 10:09:36 +11:00
Maikel Linke
79ad05d405 i18n group image help text 2016-03-23 10:01:04 +11:00
elf Pavlik
6d0dc438a7 i18n fixes after @sstead feedback in #799 2016-03-21 16:55:57 -06:00
Maikel
ca0c677d46 Auto-merged master into uk/account-balances on deployment. 2016-03-19 07:16:41 +11:00
Maikel Linke
41970ecf07 Use auth directive for Login button 
Use the auth directive instead of the AuthenticationCtrl for the Login
button in the menu and on checkout.
 2016-03-18 17:08:32 +11:00
Maikel Linke
2a9e35355e Add auth directive to use AuthenticationService 
The auth directive binds to all elements with the auth attribute. It
adds a click event that opens the login/register/password modal.
 2016-03-18 16:46:29 +11:00
Maikel Linke
a48b992ec0 Shops can require users to login 
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.

Closes #849.
 2016-03-18 16:46:28 +11:00
Rohan Mitchell
16741598fd Merge branch 'master' into products-caching 
Conflicts:
	spec/features/admin/variant_overrides_spec.rb
 2016-03-18 09:59:56 +11:00