Commit Graph

87 Commits

Author SHA1 Message Date
Rob Harrington
28807d4f4d Merge migrate_ent_types into reg 2014-10-17 10:20:48 +11:00
Rob Harrington
31c4aad9e1 JS for closing alerts works 2014-10-09 13:21:30 +11:00
Rob Harrington
83f9867632 Move registration login into own folder, reinstate ofn-inline-alert 2014-10-09 13:15:19 +11:00
Rafael Schouten
ccdcf16cec rename file 2014-10-01 18:47:50 +10:00
Rafael Schouten
54b138b2cc add transclusion to modal directive by default 2014-10-01 18:47:22 +10:00
summerscope
0c99007323 Tweak the modal styling for register modals 2014-09-26 17:45:15 +10:00
Rafael Schouten
55f4415c0d Merge branch 'master' into cleanup
Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml
2014-09-25 19:42:20 +10:00
Rafael Schouten
0e2774882f dry enterprise angular 2014-09-25 13:06:02 +10:00
Rob Harrington
f5849e91dc Adding limit reached modal to registration 2014-09-25 12:25:32 +10:00
Rob H
4d106129ee Creating an about page including flash boxes for registration 2014-09-11 17:07:05 +10:00
Will Marshall
6b00b1c14c MOAR COMMENTS 2014-07-31 15:58:03 +10:00
Will Marshall
647495465a Comments and minor refactoring 2014-07-31 15:14:11 +10:00
Will Marshall
042db2d150 Some comments and refactoring 2014-07-31 15:14:11 +10:00
Will Marshall
0f76892a5b Handling max quantity magically 2014-07-31 12:23:10 +10:00
summerscope
33a177ed47 Make map input placeholder message useful 2014-07-31 12:00:46 +10:00
Rohan Mitchell
9fa0413e8e Add full price breakdown 2014-07-30 15:11:59 +10:00
Rohan Mitchell
fc95e088df Show collapsed price breakdown 2014-07-30 14:59:16 +10:00
Will Marshall
339e5975fa Merge branch 'master' into breakdowns 2014-07-30 13:45:46 +10:00
Will Marshall
10fcf80be1 Switching back to proper bounds fitting 2014-07-29 15:34:14 +10:00
Will Marshall
606981dee9 Merge branch 'maps' 2014-07-29 15:32:23 +10:00
Will Marshall
90eea5cb16 Switching to a single directive to render variants on /shop 2014-07-29 15:23:10 +10:00
Will Marshall
2d40a8f023 Fixing links on modals 2014-07-29 12:20:06 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Will Marshall
39a79869c0 Disabling buttons and some work on the price breakdowns, including commenting them out for now 2014-07-29 11:33:25 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Will Marshall
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +10:00
Will Marshall
ea357b54ab Adding some map searching capabilities 2014-07-16 11:19:16 +10:00
Will Marshall
7bd65d7854 Performance improvements 2014-07-11 15:09:44 +10:00
Will Marshall
61dbc2cd63 Replace for shipping selector 2014-07-11 12:54:40 +10:00
Will Marshall
21d1d2d1c1 Replacing taxon directive 2014-07-11 12:53:32 +10:00
Will Marshall
ef55bf97c6 Bunch of small fixes for Laura 2014-07-11 12:37:38 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
Will Marshall
da02f9c0b0 Adding icons to shipping selectors 2014-07-10 12:02:34 +10:00
Will Marshall
409d647f62 Fixing up hubs page 2014-07-10 11:38:17 +10:00
Will Marshall
6f3f40e2e6 Adding query string to search params 2014-07-09 15:45:05 +10:00
Will Marshall
eb9ec1497c Backwards 2014-07-09 14:26:42 +10:00
Will Marshall
fb8d7907f9 Rearchitecting the thing 2014-07-09 14:07:38 +10:00
Will Marshall
0b27040dcb Taxon selection finesse 2014-07-09 10:53:52 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +10:00
Will Marshall
f335b6a576 Taxon selectors and show/hide behaviour 2014-07-04 14:09:53 +10:00
Will Marshall
f316b8dec5 Adding product modals in new format 2014-06-27 15:15:41 +10:00
Will Marshall
e4c8c19fea Tweaking the producer modal 2014-06-27 14:39:50 +10:00
Will Marshall
a49fe2bf65 Fixing a regression bug 2014-06-25 16:30:23 +10:00
Will Marshall
4f3d468db6 Dereferencing groups and adding modals to page 2014-06-24 17:15:31 +10:00
Will Marshall
c09555e380 Tab fixes, new tests, reworking modals 2014-06-24 17:15:31 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00
summerscope
591441b968 Making a js change to remove hub name from shipping method label 2014-06-19 16:31:11 +10:00
Will Marshall
37fee5c316 Reworking the empties cart and active table link stuff 2014-06-17 16:33:31 +10:00
Will Marshall
415a4eff0a Not pre-loading images and setting the map back to gifses 2014-06-13 11:05:32 +10:00
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00