raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,928 Commits 18 Branches 451 Tags
64fdbcf04f6a25c07650e8d613c1bc91c5db4e5f
Commit Graph

3928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Schouten
64fdbcf04f update enterprise type spec 2014-09-18 18:17:31 +10:00
Rafael Schouten
0d5106d571 refactor enterprise type logic and fix icons 2014-09-18 18:15:28 +10:00
Rafael Schouten
1fdcbbec40 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 2014-09-18 15:15:01 +10:00
Rafael Schouten
bd922085c4 icons and entity category logic 2014-09-18 15:14:55 +10:00
summerscope
c42f83b6b1 Tweak markup to show producer name and write logic for link around producer if also own shopfront 2014-09-18 15:13:48 +10:00
Rafael Schouten
d75076e1c9 producer icons and inital link logic 2014-09-18 13:59:47 +10:00
Rafael Schouten
21628ed069 Merge branch 'master' into ent_types_frontend2 2014-09-17 17:45:55 +10:00
Rafael Schouten
e9dd863462 Merge branch 'master' into payment_description 
Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb
 2014-09-17 17:07:43 +10:00
Rafael Schouten
83b19ee632 fix haml and formatting on confirm email 2014-09-17 16:56:44 +10:00
Rafael Schouten
79fd8ed98b dubug mail template 2014-09-17 15:37:38 +10:00
Rafael Schouten
e618c4c2c0 add payment description to checkout 2014-09-17 14:56:29 +10:00
rafaqz
ee6b71b140 Merge pull request #260 from openfoodfoundation/currency 
Merge Currency branch
 2014-09-17 13:47:37 +10:00
Rafael Schouten
1c9bb906d1 Merge branch 'currency' of https://github.com/openfoodfoundation/openfoodnetwork into currency 2014-09-17 13:21:56 +10:00
Rafael Schouten
ac3c3f9f6c remove to_f on decimals 2014-09-17 13:19:34 +10:00
Rafael Schouten
6829636f11 comit ng-tst changes elsewhere 2014-09-17 13:19:08 +10:00
rafaqz
98ba135d49 Explain weird spree override 2014-09-17 13:12:27 +10:00
Rafael Schouten
4a93e9e94f Merge branch 'master' into currency 2014-09-17 12:49:10 +10:00
Rafael Schouten
b6fd3a11fa remove old mailer 2014-09-17 11:54:06 +10:00
Rafael Schouten
f79dfed6ef use haml for mailer 2014-09-17 11:53:47 +10:00
Rob Harrington
0fdbcc0023 Make dates consistent 2014-09-17 11:39:39 +10:00
Rob Harrington
eead8d665f Pending bulk order mgmt specs 2014-09-17 11:39:20 +10:00
Rafael Schouten
01c98bf6e4 refactor and bugfix for tests 2014-09-17 01:07:34 +10:00
Rob Harrington
22e61d9834 TEMP: spit out variables in failing oc spec 2014-09-16 23:47:34 +10:00
Rob Harrington
279c5925ef Add helpers to registration spec to counter JS weirdness 2014-09-16 23:46:34 +10:00
Rob Harrington
9e2e96d19e Schema weirdness 2014-09-16 23:45:36 +10:00
Rafael Schouten
49476b17e8 fix typos and add missing helper 2014-09-16 16:10:48 +10:00
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
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