Maikel Linke
|
504a053693
|
link_to_ext helper for group pages
|
2015-02-05 17:21:41 +11:00 |
|
summerscope
|
148333467f
|
Groups styling and markup - finishing up contact info partial etc
|
2015-02-05 17:14:56 +11:00 |
|
Maikel Linke
|
242fb49276
|
checking for undefined phone number in model
|
2015-02-05 16:17:29 +11:00 |
|
Maikel Linke
|
37dbd376e9
|
fixing indent
|
2015-02-05 15:54:53 +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
|
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 |
|
summerscope
|
28b2dd40dd
|
Kill the pad top for Producers tab content too
|
2015-02-05 12:31:38 +11:00 |
|
summerscope
|
c9bbe80738
|
Remove padding class to producers tab content
|
2015-02-05 12:28:24 +11:00 |
|
Maikel Linke
|
0f7b880409
|
restoring groups hubs tab
|
2015-02-05 12:23:08 +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 |
|
Maikel Linke
|
a7c2a73fa8
|
make groups editable by group owners
|
2015-02-05 12:05:39 +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
|
5ea3733c8a
|
Groups page styling WIP
|
2015-01-30 14:07:38 +11:00 |
|
summerscope
|
d99a54accf
|
WIP groups individual page template markup - still needs alot of love.
|
2015-01-29 17:43:36 +11:00 |
|
summerscope
|
fcd9653a79
|
Add padding to groups homepage
|
2015-01-29 15:52:40 +11:00 |
|
summerscope
|
8e42f29bde
|
WIP groups page styling and markup updates
|
2015-01-29 15:52:20 +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 |
|
Maikel Linke
|
87b092fdf7
|
Adding addresses to existing groups and make them changable
|
2015-01-22 12:10:54 +11:00 |
|
Rob Harrington
|
76acbb6159
|
Empty arrays are no longer considered falsy by angular.js parser (see bdfc9c02d0)
|
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
|
9245af6a8f
|
Producer properties routes use enterprise permalink
|
2015-01-22 10:19:47 +11:00 |
|
Rob Harrington
|
a0990c107f
|
Moving navigation check to controller
|
2015-01-22 10:19:44 +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 |
|
Rob Harrington
|
3ec3441cfa
|
Replacing all uses of the old enterprise shop url helper
|
2015-01-22 10:19:43 +11:00 |
|
Rob Harrington
|
39889390ef
|
Altering shop page routing so that shop url is copy-and-pastable
|
2015-01-22 10:19:42 +11:00 |
|
Maikel Linke
|
0d9a0919e5
|
show contact a group's contact footer
|
2015-01-21 16:39:41 +11:00 |
|
Maikel Linke
|
c1aa2f9b33
|
Display contact information in the front end
|
2015-01-21 16:12:28 +11:00 |
|
Maikel Linke
|
650e35c13e
|
Adding contact information to groups backend
|
2015-01-21 16:11:55 +11:00 |
|
Maikel Linke
|
71de15b3e4
|
Contact address for enterprise group
|
2015-01-21 12:32:07 +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
|
2c307f09c3
|
Changing edit cart button to link
|
2015-01-16 15:47:56 +11:00 |
|
summerscope
|
3bd77c74a5
|
Improve logic on shopping cart button to add meaningful labels for various states
|
2015-01-16 14:57:09 +11:00 |
|
summerscope
|
51687b5c2c
|
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
|
2015-01-16 13:27:16 +11:00 |
|
Rob Harrington
|
b3e67fa164
|
Take two on disabled logic
|
2015-01-15 17:34:04 +11:00 |
|
summerscope
|
d2277999cc
|
Undo change of logic on disabled state on Shopping cart button
|
2015-01-15 17:13:10 +11:00 |
|
summerscope
|
676e7cb4d6
|
Make taxon flag 2 cols for small devices
|
2015-01-15 16:45:09 +11:00 |
|
summerscope
|
1dfbc88813
|
Change logic on disabled class on Your shopping cart button as this was swapped the wrong way around
|
2015-01-15 16:16:01 +11:00 |
|
summerscope
|
891a9b06a8
|
Add expand icon on top of image thumbnail
|
2015-01-15 15:23:10 +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
|
d5437e1508
|
edit_profile permission no longer shows links to manage shipping methods, payment methods and enterprise fees for an enterprise
|
2015-01-15 13:43:39 +11:00 |
|
Rohan Mitchell
|
642de2f65f
|
Only show delete enterprise link when user has permission
|
2015-01-15 13:43:39 +11:00 |
|
Maikel Linke
|
02a276b9c9
|
Producer and hub lists with search
Fixing map display as well.
|
2015-01-14 15:18:46 +11:00 |
|