Rohan Mitchell
|
efbf2c7ffa
|
Display extended variant name in quick cart
|
2015-03-13 12:58:53 +11:00 |
|
Rob Harrington
|
8de6f983a2
|
User must set the coordinator first when creating an order cycle
|
2015-02-27 17:24:36 +11:00 |
|
Maikel Linke
|
3beff77164
|
Merge remote-tracking branch 'origin/master' into group-pages
|
2015-02-26 17:22:13 +11:00 |
|
Maikel Linke
|
1f7aec0c1d
|
group owner select box in own tab
|
2015-02-26 13:09:46 +11:00 |
|
Rohan Mitchell
|
fdde55f631
|
Add spec for ext_url filter, refactor
|
2015-02-23 10:06:42 +11:00 |
|
Maikel Linke
|
eade689070
|
linkToService directive to generate external links
|
2015-02-22 16:15:04 +11:00 |
|
Maikel Linke
|
718a5911a3
|
code style and cleanup
|
2015-02-19 10:48:39 +11:00 |
|
Maikel Linke
|
346a4e71d0
|
side menu partial does not require showItem defined
|
2015-02-19 10:17:58 +11:00 |
|
Maikel Linke
|
9496987da6
|
Fix display of admin group side menu
|
2015-02-18 12:04:17 +11:00 |
|
Liv Galendez
|
b9248d3e2c
|
Fixed typo in empty cart error message
|
2015-02-18 10:47:09 +11:00 |
|
Maikel Linke
|
903bd21577
|
Merge remote-tracking branch 'origin/master' into group-pages-merge
Conflicts:
README.markdown
db/schema.rb
|
2015-02-13 15:42:36 +11:00 |
|
Rob Harrington
|
5c09ebf138
|
Adding manager managment to enterprise edit form
|
2015-02-12 11:34:58 +11:00 |
|
Rob Harrington
|
ee5ab22501
|
Moving interface for changing owner to new 'Users' tab
|
2015-02-12 11:34:58 +11:00 |
|
Maikel Linke
|
313843d798
|
moving contact partial and giving example code
|
2015-02-05 15:50:33 +11:00 |
|
Maikel Linke
|
78a8f8c1bb
|
Merge remote-tracking branch 'origin/group-pages' into group-pages
|
2015-02-05 12:07:52 +11:00 |
|
summerscope
|
b1b1aa5b1e
|
Groups page WIP with mikael and rob
|
2015-02-05 12:07:11 +11:00 |
|
Rohan Mitchell
|
22f6ece83f
|
When fetching products for variant overrides admin, fetch all overridable products
|
2015-02-04 10:16:34 +11:00 |
|
Maikel Linke
|
91b35d068c
|
Adding owner to groups
Groups have owners and users own groups. The owners are displayed and
changable on the group's page by admin users.
|
2015-02-02 15:58:34 +11:00 |
|
summerscope
|
6fddb491db
|
New partial for groups contact
|
2015-01-30 14:07:55 +11:00 |
|
Rohan Mitchell
|
7ac888ae00
|
Admin can grant create_variant_overrides permission
|
2015-01-30 11:56:05 +11:00 |
|
Rob Harrington
|
fd9f65f1b6
|
Merge branch 'shopfront-filters' into shop-url
|
2015-01-28 10:57:11 +11:00 |
|
Rob Harrington
|
adbe127e76
|
Revert "Update bindonce"
This reverts commit 48dc85cfc2.
|
2015-01-25 14:08:29 +11:00 |
|
Rob Harrington
|
b429be707c
|
Split out payment and shipping methods from admin enterprises controller as services
|
2015-01-22 12:19:41 +11:00 |
|
Rob Harrington
|
d12fdd23fb
|
Fixing navcheck callback
|
2015-01-22 10:46:01 +11:00 |
|
Rob Harrington
|
0791cc3c2a
|
Making sure that we have a .path() in HashNavigation
|
2015-01-22 10:19:47 +11:00 |
|
Rob Harrington
|
d7ea81e821
|
Prevent default form action from submitting ordercycle forms
|
2015-01-22 10:19:47 +11:00 |
|
Rob Harrington
|
177181cd75
|
CurrentUser always returns a factory
|
2015-01-22 10:19:45 +11:00 |
|
Rob Harrington
|
48dc85cfc2
|
Update bindonce
|
2015-01-22 10:19:44 +11:00 |
|
Rob Harrington
|
a0990c107f
|
Moving navigation check to controller
|
2015-01-22 10:19:44 +11:00 |
|
Rob Harrington
|
83726eba63
|
Refactoring permalink checker to handle multiple requests elegantly
|
2015-01-22 10:19:43 +11:00 |
|
Rob Harrington
|
4088bdc236
|
Clean up permalink checker
|
2015-01-22 10:19:43 +11:00 |
|
Rob Harrington
|
9b78963d5a
|
Adding a javascript interface for checking permalinks and user input on enterprise console
|
2015-01-22 10:19:43 +11:00 |
|
Maikel Linke
|
650e35c13e
|
Adding contact information to groups backend
|
2015-01-21 16:11:55 +11:00 |
|
summerscope
|
1753432f36
|
Adding new loading animation to replace ugly and large gif
|
2015-01-16 17:06:40 +11:00 |
|
Rob Harrington
|
1d80bee595
|
Cart item total reflects total number of items in the cart
|
2015-01-16 16:06:51 +11:00 |
|
Rob Harrington
|
b3e67fa164
|
Take two on disabled logic
|
2015-01-15 17:34:04 +11:00 |
|
Rob Harrington
|
ac34da4f24
|
Altering logic around disabled state for 'Your Shopping Cart' button
|
2015-01-15 17:19:48 +11:00 |
|
summerscope
|
932604bd69
|
Add in logic to style price column differently if nul vs has value
|
2015-01-15 16:01:00 +11:00 |
|
Maikel Linke
|
4dc0701213
|
Side menu for enterprise group page
|
2015-01-15 15:04:21 +11:00 |
|
summerscope
|
b5879d51ac
|
Merging master into shopfront-filters branch
|
2015-01-15 14:15:25 +11:00 |
|
Rohan Mitchell
|
dcc04ea538
|
On enterprise edit page, do not show side menu links we don't have permission to
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
83754a01ef
|
Make side menu item visibility declarative
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
a93a824b83
|
Admin can grant permission for an enterprise to edit the profile of another
|
2015-01-15 13:43:38 +11:00 |
|
Rohan Mitchell
|
2170c7ede1
|
Fix broken JS spec
|
2015-01-15 13:43:38 +11:00 |
|
Maikel Linke
|
02a276b9c9
|
Producer and hub lists with search
Fixing map display as well.
|
2015-01-14 15:18:46 +11:00 |
|
Maikel Linke
|
9f1a773a58
|
MapController: copy default config instead of referencing
Copying makes it possible to have multiple independent maps.
|
2015-01-14 14:34:31 +11:00 |
|
Maikel Linke
|
0e510998a4
|
Handling missing options in shipping filter call
|
2015-01-14 14:33:37 +11:00 |
|
Rohan Mitchell
|
0431e0048c
|
Merge branch 'master' into variant-overrides-frontend
Conflicts:
app/controllers/shop_controller.rb
app/views/shop/products/_form.html.haml
spec/controllers/shop_controller_spec.rb
|
2015-01-12 16:48:51 +11:00 |
|
Maikel Linke
|
9798b05a24
|
TabsCtrl can show tabs that don't toggle
toggle: tabs show on first click and hide on second click
select: tabs show on every click, one tab is always active
|
2015-01-06 22:39:15 +11:00 |
|
summerscope
|
6863dd75ef
|
Restyling button for price breakdown to make it more clear that users press again to close the pop over
|
2014-12-19 17:05:13 +11:00 |
|