raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 21 Branches 450 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

63 Commits

Author SHA1 Message Date
Maikel Linke
85c99102dd i18n: Replacing all language strings in app/view/ 
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
 2015-08-28 16:59:23 +10:00
Rafael Schouten
6fc36a3e6c swap redundant producer modal for general enterprise modal 2014-10-07 10:48:04 +11:00
summerscope
3cff83b7a5 Kill the outside modal close button styling once and for all 2014-09-12 14:42:58 +10:00
Will Marshall
e8045cac42 Renaming to state_name 2014-07-31 11:36:53 +10:00
summerscope
6dc15ff075 Make the modal headers consistent 2014-07-28 16:14:20 +10:00
Will Marshall
ce3cb7890b Removing old product modal 2014-06-27 15:16:08 +10:00
Will Marshall
b3f0cb1e74 Bunch of minor bugfixes 2014-06-24 17:14:01 +10:00
Will Marshall
21589fd5b0 Hack patching home page modals 2014-06-20 16:31:49 +10:00
summerscope
3a1bf24a86 Product modal adjust markup for SVG icon styling 2014-06-20 10:00:54 +10:00
summerscope
5319ad8846 Changing name of classes to be less contextual and more reusable 2014-06-19 16:29:28 +10:00
Will Marshall
7f4816c9a5 Adding new producer modal and dereferencing shopfront 2014-06-19 14:00:37 +10:00
Will Marshall
57c5c2d411 Changing icon markup 2014-06-17 14:34:38 +10:00
Will Marshall
a55e58d50c Adding working scrolling to anchors 2014-06-12 16:13:51 +10:00
summerscope
cb5948047b Adding new icons into producer modal. Making it pretty 2014-06-04 16:50:51 +10:00
summerscope
31bab3469e Implementing new X icon for modal window 2014-06-03 11:20:15 +10:00
summerscope
653120888f Implementing new X icon for modal window 2014-06-03 11:20:03 +10:00
summerscope
c07ca67f29 Implementing new X icon for modal window 2014-06-03 11:19:56 +10:00
summerscope
73a68799be Implementing new X icon for modal window 2014-06-03 11:19:45 +10:00
summerscope
d160f4fe51 Implementing new X icon for modal window 2014-06-03 11:19:37 +10:00
summerscope
cd332c1eb1 Implementing new X icon for modal window 2014-06-03 11:19:22 +10:00
summerscope
8caccfc5b0 Merge laura_and_will into icon_font 2014-05-30 17:01:49 +10:00
summerscope
ef5b36cddd Styling producers 2014-05-30 16:39:07 +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
summerscope
72c50486fa ADding new icons into producer modal 2014-05-30 14:29:08 +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
39358247fd Kill whitespace around icon 2014-05-29 11:47:06 +10:00
Will Marshall
74211cbfc7 Merge branch 'master' into fixing_modals 
Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl
 2014-05-29 11:14:16 +10:00
summerscope
b8eb43f8db Add groups icon to modal 2014-05-29 11:08:35 +10:00
summerscope
1248eaeed7 Add producers icon to modal 2014-05-29 11:05:28 +10:00
summerscope
4971e2305f Add hub icon to modal 2014-05-29 10:54:07 +10:00
Will Marshall
4b1f409774 Only rendering images that exist{ 2014-05-28 16:19:10 +10:00
Will Marshall
fcfda13a73 Patching a couple of minor regressions 2014-05-28 16:10:28 +10:00
Will Marshall
5eb54d1ac3 Merge branch 'groups_page' into fixing_modals 2014-05-28 16:04:55 +10:00
Will Marshall
50c7bd55be Adding url strip and re-construction of http 2014-05-28 15:06:01 +10:00
Will Marshall
0c8ee2488b Moving back to ng-bind-html 2014-05-28 14:58:53 +10:00
Will Marshall
c26462db57 Addin some URL stripping 2014-05-28 14:45:26 +10:00
Will Marshall
576f10dbc3 Adding ng-if checks 
Conflicts:
	app/views/modals/_producer.html.haml
 2014-05-28 14:44:17 +10:00
summerscope
2130470eaf Styling for groups page 2014-05-27 17:11:42 +10:00
Rohan Mitchell
e119192cf1 Manually revert merge commit "Hack patching the modals" 2014-05-24 09:23:12 +10:00
Rohan Mitchell
223caa046c Revert "Producers modal styling and markup" 
This reverts commit 4657285769.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-24 09:15:22 +10:00
Rohan Mitchell
69e0e71eb6 Revert "Styling for shop page product modal" 
This reverts commit 84b6f99321.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-24 09:12:24 +10:00
Rohan Mitchell
a7566e3413 Revert "Always showing social media" 
This reverts commit aa23b03f98.
 2014-05-24 09:07:52 +10:00
Will Marshall
aa23b03f98 Always showing social media 2014-05-23 17:29:18 +10:00
Will Marshall
fb7b9a051a Hack patching the modals 2014-05-23 17:22:27 +10:00
Will Marshall
40f116783c Merge branch 'new_shop' 
Conflicts:
	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-23 16:02:20 +10:00
summerscope
84b6f99321 Styling for shop page product modal 2014-05-23 15:59:06 +10:00
summerscope
4657285769 Producers modal styling and markup 2014-05-22 16:35:48 +10:00
summerscope
d7bc1a9b95 Styling for shop page product modal 2014-05-22 14:40:35 +10:00
Will Marshall
0140472fbc Adding working modals 2014-05-22 12:40:46 +10:00