raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,851 Commits 17 Branches 453 Tags
346a4e71d048a4de9c263dc9f4e87f26d14ec510
Commit Graph

1612 Commits

Author SHA1 Message Date
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
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
summerscope
23fc428d95 Move spinner icon to left of text 2015-01-16 14:57:30 +11:00
summerscope
8334ff736b Styling for shopping cart buttons and spinner 2015-01-16 13:27:34 +11:00
summerscope
21108b34b6 Add new animation for spinning 2015-01-16 13:26:40 +11:00
summerscope
2a21889216 Remove border on product thumbnail to clean up UI 2015-01-16 13:06:30 +11:00
summerscope
b451b94fd1 Improving styling on large thumbnail view of product images 2015-01-16 13:06:02 +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
cdd6c2daf2 Styling product summary row to allow for hiding product thumb at a larger break point 2015-01-15 16:46:55 +11:00
summerscope
4a881a5aa5 Turn off product thumb at a larger break point 2015-01-15 16:46:18 +11:00
summerscope
d5d218c450 Make taxon flag smaller for smallest device breakpoint 2015-01-15 16:45:54 +11:00
summerscope
f8622be21d Adding in new color variable 2015-01-15 16:45:29 +11:00