raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,031 Commits 19 Branches 453 Tags
a4e72f6fbc32db94a33e5966e20bf42233f31cf5
Commit Graph

146 Commits

Author SHA1 Message Date
summerscope
a4e72f6fbc Making the header more semantically meaningful for HTML5. Add in row to make spacing consistent. Steps bar moves to top 2014-10-10 18:20:38 +11:00
summerscope
89a51bf1da Adjustments to layout, responsive logic, simplify column structure 2014-10-10 18:19:42 +11:00
Rob Harrington
9b275cc5f0 WIP: Shuffling around order of cards in registration 2014-10-09 17:26:31 +11:00
Rob Harrington
d1e3f74c03 Add loading gif to image uploaders 2014-10-09 15:56:54 +11:00
Rob Harrington
31c4aad9e1 JS for closing alerts works 2014-10-09 13:21:30 +11:00
summerscope
237d129710 Changing the markup to give a class where is a producer 2014-09-26 15:01:23 +10:00
summerscope
dee503befb Tweak language around the long description 2014-09-26 15:01:22 +10:00
Rob Harrington
b55b4e9a0c Merge branch 'master' into ent_types_frontend 2014-09-25 17:20:15 +10:00
Rob Harrington
f5849e91dc Adding limit reached modal to registration 2014-09-25 12:25:32 +10:00
Rafael Schouten
da620f3723 Merge branch 'master' into ent_types_frontend 2014-09-25 10:09:42 +10:00
summerscope
5e4e939087 Return template markup which was accidentally removed in Rafs merge 2014-09-19 17:47:49 +10:00
Rafael Schouten
559d3b0e4b fixup the header but needs some styling 2014-09-19 17:24:41 +10:00
Rafael Schouten
883e5f1095 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 
Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml
 2014-09-19 17:22:29 +10:00
Rafael Schouten
abc5a215a2 add map modals, profile filters and bugfixes 2014-09-19 17:07:07 +10:00
summerscope
5a7175e75d Tweak markup to make modals fit headers nicely across small sizes 2014-09-19 16:43:31 +10:00
summerscope
4c7fa4eb9f Fix markup so that text is not nested inside icon markup 2014-09-19 15:19:47 +10:00
Rob Harrington
d3e72b5a2a Adding images to registration process 2014-09-19 12:41:24 +10:00
Rafael Schouten
0d5106d571 refactor enterprise type logic and fix icons 2014-09-18 18:15:28 +10:00
Rafael Schouten
bd922085c4 icons and entity category logic 2014-09-18 15:14:55 +10:00
Rafael Schouten
01c98bf6e4 refactor and bugfix for tests 2014-09-17 01:07:34 +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
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
f5048ecf7c Sends confirmation email when Enterprise is created 2014-09-12 13:24:17 +10:00
Rob H
6ee3010fa7 Differentiation of on-boarding process by url 2014-09-12 11:00:34 +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
fc0afae51c Adding form validation to contact page 2014-09-11 17:10:59 +10:00
Rob H
454e4c971a Adding validation to address page 2014-09-11 17:10:59 +10:00
Rob H
34841f8543 Refactoring registration form controller 2014-09-11 17:10:59 +10:00
Rob H
412e906ed3 Adding basic validation to reg process 2014-09-11 17:10:59 +10:00
summerscope
8d570286a1 Adding in sexy logic to add color to name depending on type 2014-09-11 17:10:58 +10:00
summerscope
f8c761f492 Comment out unused section, set column layout to match previous step 2014-09-11 17:10:58 +10:00
summerscope
e0fff552f9 Adjust button layout at bottom of page 2014-09-11 17:10:58 +10:00
summerscope
4d8796669b Adding in pretty alert boxes, yay! 2014-09-11 17:10:58 +10:00
summerscope
dc5506d06b Adjust button layout at bottom of page 2014-09-11 17:10:58 +10:00
summerscope
100d672eef Adjust button layout at bottom of page 2014-09-11 17:10:58 +10:00
summerscope
75c62a7cb8 Markup changes to step 2 address 2014-09-11 17:10:07 +10:00
summerscope
2917c0fa44 More styling and work on step 1 - DETAILS 2014-09-11 17:10:07 +10:00
Rob H
c93673d78b Adding form to each page of registration 2014-09-11 17:10:07 +10:00
summerscope
c54b18a416 Cleanupm markup 2014-09-11 17:07:07 +10:00
summerscope
8a4dcef7fe Tweak layout and simplify column structures 2014-09-11 17:07:07 +10:00
Rob H
f1ef8ba3c7 Getting signup to work and authentication to load in reg specific template 2014-09-11 17:07:07 +10:00
summerscope
8b928b5a66 Styling on-boarding wizard Introduction step 2014-09-11 17:07:06 +10:00
Rob H
f1f9a2e7fc Updating on later pages of registration process 2014-09-11 17:07:06 +10:00
summerscope
60d6599f9b Tweak chirpy message in view 2014-09-11 17:07:06 +10:00
Rob H
dc43612a04 Adding an 'r' 2014-09-11 17:07:06 +10:00
Rob H
bc0c9dd229 Adding the social page to registration form 2014-09-11 17:07:06 +10:00
Rob H
b848d583ff Adding the remainder of pages to registration process 2014-09-11 17:07:05 +10:00
Rob H
4d106129ee Creating an about page including flash boxes for registration 2014-09-11 17:07:05 +10:00