raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Marshall
3ddd7c31e8 Patching which image is rendered 2014-05-30 15:08:16 +10:00
Will Marshall
be640fd856 Patching a spec and naming something 2014-05-30 15:02:47 +10:00
Will Marshall
7304e24591 Switching the image dimensions 2014-05-30 14:47:53 +10:00
Will Marshall
a7340df6a5 Removing some dud test content 2014-05-30 14:45:27 +10:00
summerscope
5cbc60e686 Typo fix on food hub modal 2014-05-30 14:43:31 +10:00
summerscope
68582514ef Grammar fix up for food hub modal 2014-05-30 14:41:34 +10:00
Will Marshall
a979334f2a Adding primary taxon 2014-05-30 14:31:36 +10:00
Will Marshall
b736145552 Adding primary taxon to admin forms 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
 2014-05-30 14:31:27 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00
summerscope
72c50486fa ADding new icons into producer modal 2014-05-30 14:29:08 +10:00
summerscope
91224ed0a4 Merge issues. Removing position fixed on modal window styling. 2014-05-30 14:27:37 +10:00
Will Marshall
20873b6e45 Patching a minor regression spec 2014-05-30 14:21:21 +10:00
Will Marshall
18597a2377 Patching a minor regression spec 2014-05-30 14:18:51 +10:00
summerscope
5f6b8c9b5b Merge branch 'laura_and_will' into icon_font 2014-05-30 13:19:54 +10:00
summerscope
5bdb38e293 Merge issues. Removing position fixed on modal window styling. 2014-05-30 13:19:47 +10:00
Will Marshall
85ee33517a Restoring another deleted file 2014-05-30 13:19:23 +10:00
summerscope
42a9f16800 Adding in new icon into producer partial 2014-05-30 13:08:18 +10:00
summerscope
49a39bb240 Adding unlock icon to signed in 2014-05-30 13:06:48 +10:00
summerscope
179d9f609c Adding in new lock icon to signed in 2014-05-30 13:05:56 +10:00
summerscope
2c334a0180 Styling for trash icon on checkout page 2014-05-30 13:02:34 +10:00
Will Marshall
2b0bdc69cd Fixing a scope issue 2014-05-30 13:01:16 +10:00
Will Marshall
638d6d2ac0 Moving around the authentication specs 2014-05-30 12:58:58 +10:00
summerscope
00ac80bdbb Add new icons 2014-05-30 12:56:56 +10:00
Will Marshall
368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL 2014-05-30 12:52:14 +10:00
summerscope
a54b3f7849 Adding new icon for refresh 2014-05-30 12:39:44 +10:00
summerscope
9a962f7445 Add new icons to checkout & back to cart buttons 2014-05-30 12:35:54 +10:00
summerscope
5a7df20a2e Update icon font for mixins 2014-05-30 12:32:46 +10:00
summerscope
589188d21e Update icons for Tabs on hub shopping page 2014-05-30 12:32:28 +10:00
Will Marshall
206c947ea5 Tweaking test 2014-05-30 12:20:18 +10:00
summerscope
5c44413ae9 Merge branch 'laura_and_will' into icon_font 2014-05-30 12:18:29 +10:00
summerscope
10418b6035 Merge issues. Removing position fixed on modal window styling. 2014-05-30 12:17:44 +10:00
summerscope
15cde6c372 Merge branch 'laura_and_will' into icon_font 
Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml
 2014-05-30 12:12:07 +10:00
summerscope
43cc77c88b Adding icon into button 2014-05-30 12:01:57 +10:00
Will Marshall
ee785a3498 Merge branch 'master' into laura_and_will 2014-05-30 12:01:33 +10:00
Will Marshall
db131af5e7 Patching a class hook 2014-05-30 12:00:28 +10:00
Will Marshall
1a47a7486e Automatically closing the accordion if the form is already valid 2014-05-30 11:58:22 +10:00
summerscope
3fca8640fd Add class right to icons 2014-05-30 11:57:19 +10:00
summerscope
9cae581cda Add class right to icons 2014-05-30 11:57:06 +10:00
summerscope
34c4fc8aa1 Add class right to icons 2014-05-30 11:56:52 +10:00
summerscope
474581211b Add class right to icons 2014-05-30 11:56:41 +10:00
summerscope
e064aa3173 Restyling labels for new icons in checkout process 2014-05-30 11:49:32 +10:00
summerscope
cca6a39476 Adding in icons to checkout partial 2014-05-30 11:49:14 +10:00
summerscope
cbc28f6da7 Adding in icons to checkout partial 2014-05-30 11:48:59 +10:00
summerscope
b4f14197fa Adding in icons to checkout partial 2014-05-30 11:48:47 +10:00
summerscope
4893679d12 Adding in icons to checkout partial 2014-05-30 11:48:32 +10:00
Rob H
d9f7865572 Can add an image from redesigned new product page 2014-05-30 11:31:53 +10:00
summerscope
a7a8c3ecee Change icon for bullet point for list style 2014-05-30 11:30:52 +10:00
summerscope
0eb4e35ee4 New version of icon font 2014-05-30 11:30:30 +10:00
Rob H
c9acb14809 Adding primary taxon migration to schema 2014-05-30 11:30:00 +10:00
Will Marshall
dd0907addd Adding back the primary taxon migration 2014-05-30 11:24:37 +10:00