raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,782 Commits 18 Branches 452 Tags
01397b2e49a5000a3d25eaf3531e7c19fe654341
Commit Graph

1556 Commits

Author SHA1 Message Date
summerscope
9c33be911c Update placeholder label 2014-09-12 10:49:59 +10:00
summerscope
6d7fd6dc94 Add in logic to change right hand label if this is the current hub 2014-09-12 10:48:33 +10:00
summerscope
94165f17e4 Merging master into this branch to keep repository up to date 2014-09-11 16:33:44 +10:00
summerscope
24507c6c0a turn off Profile filter again until ready to support this 2014-09-11 16:29:38 +10:00
summerscope
71918539b8 Undo changing name Hubs to Shops, for the moment 2014-09-11 15:40:35 +10:00
summerscope
16ad465571 tweak placeholder name 2014-09-11 15:40:12 +10:00
summerscope
997479f5be Change label on mobile menu 2014-09-11 13:05:21 +10:00
Rohan Mitchell
4168ea054b For body content, cloak the home page only. JS should be cached after that. 2014-09-10 12:12:46 +10:00
Rohan Mitchell
b49eb8fe03 Hide angular templates on page load 2014-09-10 11:50:30 +10:00
Rob H
3ee0cf46e0 Merge branch 'working' into merging 2014-09-08 10:12:31 +10:00
Rob H
5fb4110328 Adding distributor and producer checkboxes to enterprise index 2014-09-07 21:04:53 +10:00
Rob H
6540bb8efc Adding select field for enterprise type to index when super admin 2014-09-07 19:51:14 +10:00
Rob H
b8fadb50ae Special Instructions in checkout are actually wired up 2014-09-06 12:00:27 +10:00
Rob H
780df6bfe0 Hide 'profile type' form element for non super-admin users 2014-09-05 18:38:43 +10:00
summerscope
2e8ec3df18 Tweak placeholder messages for big inputs 2014-09-05 18:07:50 +10:00
summerscope
6271b83fad Tweak placeholder messages for big inputs 2014-09-05 18:07:28 +10:00
summerscope
778cf0326b Changing placeholder for 2014-09-05 18:04:02 +10:00
summerscope
ab44046658 skinny view producers remove unnecessary spacer element 2014-09-05 17:52:36 +10:00
summerscope
a9619a6dca Changes to markup on producer page to adjust layout 2014-09-05 17:50:50 +10:00
Rob H
20bfcd6e48 Switching enterprise relationships form around 2014-09-05 17:11:57 +10:00
summerscope
60ac3f29a5 Producers page WIP 2014-09-05 16:41:00 +10:00
summerscope
b3f97479d3 Hide profile filter from search for the mo 2014-09-05 16:40:59 +10:00
Rob H
1e1ddedfb2 Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend 2014-09-05 16:18:45 +10:00
Rob H
428e4c63d4 Profile hubs don't show up in hubs list 2014-09-05 16:18:25 +10:00
summerscope
0d0ffa1cd0 Making CTA links consistent with modals, adding in logic to force space holding for producer fat view 2014-09-05 15:47:41 +10:00
summerscope
26bd1000de Changing placeholder for search input 2014-09-05 15:28:50 +10:00
summerscope
59adae5c9c Working on space placeholders for fat view 2014-09-05 15:28:32 +10:00
summerscope
99fb9c1966 Adding in markup and styling for new layout of hubs list view 2014-09-05 15:10:17 +10:00
Rohan Mitchell
3a12f9a7c8 Extract bulk product edit interface into partials 2014-09-05 15:10:17 +10:00
Rohan Mitchell
4d766a29ab Convert admin login nav to haml 2014-09-05 15:10:16 +10:00
Rohan Mitchell
57af658e7c For OC, fetch all enterprises we have access to, including those via E2E relationships 2014-09-05 15:10:13 +10:00
Rohan Mitchell
913c167fdf Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-09-05 15:10:12 +10:00
Maikel Linke
7603ea867f Store links to root_path instead of product_path 2014-09-05 15:10:12 +10:00
Maikel Linke
c5cfda5283 Adding login_nav partial from spree_auth_devise 
Preparing to change 'Store' link for Bugherd #443.
 2014-09-05 15:10:12 +10:00
Maikel Linke
aaa32528ea Giving an example name for an enterprise fee. 
The example is displayed as input placeholder. See bugherd #439.
 2014-09-05 15:10:11 +10:00
summerscope
7b9ff9b6dd Merge branch 'ent_types_frontend' of github.com:openfoodfoundation/openfoodnetwork into ent_types_frontend 
Conflicts:
	app/views/home/_skinny.html.haml
 2014-09-05 12:48:05 +10:00
summerscope
658c27408e Styling for hub listing page and tweaks to markup to accomodate new icons and styling 2014-09-05 12:32:45 +10:00
Rob H
8f6d04a129 Adding properties to enterprise serialiser to allow differentiation between profile, shopfront and aggregators 2014-09-05 12:30:52 +10:00
summerscope
b487c9848b Add checkbox for show / hide profiles 2014-09-05 12:15:14 +10:00
Rohan Mitchell
0fd496aa97 Extract bulk product edit interface into partials 2014-09-02 15:27:51 +10:00
Rohan Mitchell
818a0f8595 Convert admin login nav to haml 2014-09-02 13:45:11 +10:00
Rohan Mitchell
a347152490 Merge branch 'master' into admin-panel-store-link 2014-09-02 13:39:46 +10:00
Rohan Mitchell
7247e65115 Merge branch 'master' into enterprise-fee-naming-example 2014-09-02 13:36:50 +10:00
summerscope
a4aa949499 Applying new icons for map view 2014-08-29 18:04:06 +10:00
Rohan Mitchell
7f74854a2f For OC, fetch all enterprises we have access to, including those via E2E relationships 2014-08-29 16:38:23 +10:00
Rohan Mitchell
0b61872d96 Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-08-29 16:38:10 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +10:00
Rob H
bfd9ffd84a Adding missing data-bindings for country/state 2014-08-28 14:25:21 +10:00
Rohan Mitchell
7b89e6aa80 Revert "Comment out ERPs which have confusing names, use old 'permits'" 
This reverts commit a4be0ff55a.
 2014-08-28 10:12:06 +10:00
Rohan Mitchell
1871d42e68 Switch to correct grammatical ordering of child/parent enterprise on enterprise relationships page 2014-08-28 10:09:50 +10:00