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 |
|
summerscope
|
122cf6c065
|
Groups index page styling for responsive use cases.
|
2015-02-25 10:22:33 +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 |
|
summerscope
|
e05d64a0b4
|
WIP on groups index page. Needs work from Maikel or Rohan.
|
2015-02-20 16:43:36 +11:00 |
|
summerscope
|
3aa06ee1e4
|
Tabs styling for groups page - making it pretty.
|
2015-02-20 16:14:50 +11:00 |
|
summerscope
|
3ab961a7e2
|
New mixin for gradients
|
2015-02-20 16:14:40 +11:00 |
|
Maikel Linke
|
718a5911a3
|
code style and cleanup
|
2015-02-19 10:48:39 +11:00 |
|
Maikel Linke
|
bbac5aa803
|
Using pure css for styling odd and even menu items
|
2015-02-19 10:22:37 +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 |
|
summerscope
|
90ba1d2198
|
Updating the groups header to behave better with a square thumbnail logo image.
Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)
|
2015-02-06 17:15:40 +11:00 |
|
summerscope
|
f292be8c92
|
Making styling of underlines for contact same color as HRs, bit lighter and brigher
|
2015-02-06 13:50:34 +11:00 |
|
summerscope
|
9547f91f46
|
Groups page rejig the layout to make contact column skinnier in most use cases. Obscure email and website with CTA words for fixed width on content. Styling for anchor fix global issue
|
2015-02-06 13:31:33 +11:00 |
|
summerscope
|
148333467f
|
Groups styling and markup - finishing up contact info partial etc
|
2015-02-05 17:14:56 +11:00 |
|
Maikel Linke
|
b641de6ec9
|
Merge branch 'group-pages' of github.com:openfoodfoundation/openfoodnetwork into group-pages
Conflicts:
app/views/groups/show.html.haml
|
2015-02-05 15:52:00 +11:00 |
|
Maikel Linke
|
313843d798
|
moving contact partial and giving example code
|
2015-02-05 15:50:33 +11:00 |
|
summerscope
|
1b51ea0e3a
|
Groups logo default image
|
2015-02-05 15:42:24 +11:00 |
|
summerscope
|
f2e3d298fa
|
More styling for responsive sizes groups header
|
2015-02-05 15:17:50 +11:00 |
|
summerscope
|
e19aaf6be8
|
Styling tabs for responsive design, improving groups page layout
|
2015-02-05 14:53:09 +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 |
|
summerscope
|
fd363ff6c2
|
WIP Groups individual page styling
|
2015-01-29 17:43:10 +11:00 |
|
Rohan Mitchell
|
a25bf32156
|
Show extended variant name/unit info for admin variant overrides
|
2015-01-29 15:15:28 +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 |
|
summerscope
|
d04e843315
|
kill unused line
|
2015-01-16 16:01:17 +11:00 |
|
summerscope
|
c0eb902eef
|
Turn off text shadow for buttons on popover for top nav
|
2015-01-16 16:00:18 +11:00 |
|