raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 453 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Schouten
1aa80e53b1 Merge branch 'master' into currency 
Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb
 2014-09-16 10:25:22 +10:00
Rafael Schouten
15bfe75313 ifnore figaro 2014-09-16 00:21:10 +10:00
Rafael Schouten
9448e1cbe4 add figaro env config 2014-09-16 00:13:43 +10:00
Rafael Schouten
5cf09d264c fix suburb typo 2014-09-14 12:27:24 +10:00
Rob H
143545da0d Try newer syntax to fix spec failing on CI 2014-09-12 23:41:26 +10:00
Rob H
0815775bc3 Temporary fix for race condition in registration spec 2014-09-12 17:22:54 +10:00
Rob H
30bcdde5ca Merge branch 'ent_types_frontend' into working 2014-09-12 16:45:58 +10:00
Rob H
cb7033eea0 Registration spec checks enterprise created and updated 2014-09-12 16:42:10 +10:00
Rohan Mitchell
25a889375c Fix unreliable spec 2014-09-12 16:39:47 +10:00
Rohan Mitchell
b41029d5d0 Spec reliability: Explicitly set a $0 calculator for shipping method 2014-09-12 16:11:31 +10:00
Rob H
d2c5533549 Remove use_short_wait 2014-09-12 16:10:38 +10:00
summerscope
cc9d2ebbac Modal styling fixes for scrolling on mobile view 2014-09-12 16:01:25 +10:00
summerscope
799bfae6e4 Revert "Add commented-out scrolling code. Return false from click handlers." 
This reverts commit dbefd43f07.
 2014-09-12 15:51:20 +10:00
summerscope
c365047d0c Short description goes back in producer fat view until we can clean up the HTML formatting 2014-09-12 15:40:12 +10:00
Rohan Mitchell
dbefd43f07 Add commented-out scrolling code. Return false from click handlers. 2014-09-12 15:33:02 +10:00
Rob H
8507690865 Fixing enterprise owner migration 2014-09-12 15:23:13 +10:00
summerscope
42fccd1bdf Merging master into my branch to make it up to date 2014-09-12 14:48:19 +10:00
summerscope
3cff83b7a5 Kill the outside modal close button styling once and for all 2014-09-12 14:42:58 +10:00
Rob H
05d8c825c7 Enterprise User should NOT see form elements for changing type 2014-09-12 13:40:47 +10:00
summerscope
0dd33e6635 Modal styling updates ated trying to fix mobile scrolling issue. getting there. 2014-09-12 13:40:00 +10:00
Rob H
bcca8c5c0d Merging master into all the things 2014-09-12 13:28:30 +10:00
Rob H
f5048ecf7c Sends confirmation email when Enterprise is created 2014-09-12 13:24:17 +10:00
Rohan Mitchell
4fb30f2942 When removing outgoing exchanges, do not removing variants from other outgoing exchanges 2014-09-12 12:50:04 +10:00
Rob H
5c7ab2efa3 Restrict editing of ownership and type in enterprise api controller 2014-09-12 12:47:16 +10:00
Rafael Schouten
9a1b524915 fix icon font class 2014-09-12 12:21:40 +10:00
Rob H
cc65faadd0 Specing out enterprise registration service properly 2014-09-12 11:48:17 +10:00
summerscope
a28eaba31a Turn off price graph pop overs for small devices 2014-09-12 11:45:13 +10:00
Rohan Mitchell
e50bbeaefb Edit product form shows permitted suppliers 2014-09-12 11:33:47 +10:00
summerscope
1c5a495d5c Making icons smaller, adding a bit of background shadow to pop them out 2014-09-12 11:29:41 +10:00
Rohan Mitchell
a6556f3a4f Fix broken JS specs 2014-09-12 11:12:35 +10:00
Rohan Mitchell
033fe88513 New product form shows permitted suppliers 2014-09-12 11:07:59 +10:00
summerscope
bfa71942fe Tweaks to input placeholder label 2014-09-12 11:02:28 +10:00
summerscope
01397b2e49 Tweaks to filter box 2014-09-12 11:01:35 +10:00
Rob H
6ee3010fa7 Differentiation of on-boarding process by url 2014-09-12 11:00:34 +10:00
summerscope
ecacde41dd Tweaks to big input for small screens 2014-09-12 11:00:10 +10:00
summerscope
126e9e82a6 Add in blues for use 2014-09-12 10:58:51 +10:00
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
Rafael Schouten
309ddece89 make profile icons work 2014-09-12 10:38:04 +10:00
Rafael Schouten
3ea29df111 12 option entity categories 2014-09-12 10:11:59 +10:00
Rafael Schouten
05782b6ec1 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 2014-09-12 09:59:55 +10:00
Rafael Schouten
f33a9e1a58 16 enterprise categories from four checks. 2014-09-12 01:50:36 +10:00
Rob H
043cc915e7 Removing save_screenshot calls 2014-09-11 22:40:03 +10:00
Rob H
5007fd8ec3 Shipping method 1 is used, so shipping method amount is zero 2014-09-11 22:27:05 +10:00
Rob H
a7a99b5048 Pending registration spec 2014-09-11 18:15:33 +10:00
Rob H
12f5e48479 Replace is not with isnt - damn you CoffeeScript 2014-09-11 17:58:38 +10:00
Rob H
98f7e58f9d Registration spec expects the correct url 2014-09-11 17:58:05 +10:00
summerscope
de64a5154b Fixing markup icon class name was incorrect 2014-09-11 17:13:07 +10:00
Rob H
048a741a2c Plugging final two registration pages into validation 2014-09-11 17:11:53 +10:00
Rob H
19565a5f3b Rename service 2014-09-11 17:10:59 +10:00