Will Marshall
|
5b58bf2c71
|
Adding our own custom unauthorized page
|
2014-05-30 11:24:37 +10:00 |
|
Rohan Mitchell
|
4c6a7622eb
|
Convert rep template to rabl
|
2014-05-29 17:21:52 +10:00 |
|
Rohan Mitchell
|
7d73f7d7f2
|
Fix reversed checkbox value for select all variants on order cycle admin page
|
2014-05-29 17:21:52 +10:00 |
|
Will Marshall
|
3ae2dc34e8
|
Preventing rabl from dying if no current hub
|
2014-05-29 16:50:41 +10:00 |
|
Will Marshall
|
e26a61c31f
|
Adding back sanitize
|
2014-05-29 16:49:20 +10:00 |
|
summerscope
|
c0cb9857cc
|
Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this.
|
2014-05-29 16:42:05 +10:00 |
|
Will Marshall
|
aaf9b76507
|
Making toggling of fat nodes work
|
2014-05-29 16:38:01 +10:00 |
|
Will Marshall
|
d5a652182e
|
Scrolling to groups when hotlinked
|
2014-05-29 16:31:12 +10:00 |
|
Will Marshall
|
c49d9d838c
|
Removing reference to modals and unnecessary ID
|
2014-05-29 16:19:20 +10:00 |
|
Will Marshall
|
f28fe34958
|
Removing groups modals
|
2014-05-29 16:15:39 +10:00 |
|
Will Marshall
|
e44853346e
|
Dropping current producers, switching to suppliers and using Angular
|
2014-05-29 16:12:58 +10:00 |
|
Will Marshall
|
06bac3de85
|
Fixing an incorrect sentence case
|
2014-05-29 15:45:56 +10:00 |
|
Will Marshall
|
65d11ce552
|
Removing some unnecessary
|
2014-05-29 15:41:27 +10:00 |
|
Will Marshall
|
2c1ca15393
|
Some tweaks to visual stuff
|
2014-05-29 15:37:19 +10:00 |
|
Rob H
|
9b10a2cb94
|
Added 'Add Another' link to new product page. Altered redirects
|
2014-05-29 12:13:55 +10:00 |
|
Rob H
|
e110677b3b
|
WIP: Rearrange new product form
|
2014-05-29 12:11:06 +10:00 |
|
summerscope
|
c81631118d
|
Add styling to include the search icon in big input searches for Hubs and Producers
|
2014-05-29 12:00:16 +10:00 |
|
summerscope
|
4f1c7345c5
|
Add search icon into search input on producers page
|
2014-05-29 11:59:55 +10:00 |
|
summerscope
|
86dee82acb
|
Add search icon into search input on hubs
|
2014-05-29 11:59:28 +10:00 |
|
Will Marshall
|
b757629bfa
|
Minor test tweaks
|
2014-05-29 11:52:46 +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
|
68ab24b790
|
Add links into footer
|
2014-05-29 11:10:45 +10:00 |
|
summerscope
|
b8eb43f8db
|
Add groups icon to modal
|
2014-05-29 11:08:35 +10:00 |
|
summerscope
|
81f51e734c
|
Add groups icon to listings on page
|
2014-05-29 11:07:43 +10:00 |
|
summerscope
|
1248eaeed7
|
Add producers icon to modal
|
2014-05-29 11:05:28 +10:00 |
|
summerscope
|
ff1c5a13e7
|
Add producers icon to active table
|
2014-05-29 11:01:49 +10:00 |
|
summerscope
|
8f7bab4ab7
|
Add hub icon to active table
|
2014-05-29 10:54:27 +10:00 |
|
Rohan Mitchell
|
fdff442ec6
|
Do not fetch products JSON on every shopping page
|
2014-05-29 10:54:08 +10:00 |
|
summerscope
|
4971e2305f
|
Add hub icon to modal
|
2014-05-29 10:54:07 +10:00 |
|
summerscope
|
45f6a86fd2
|
Adding new icons to menu partials
|
2014-05-29 10:19:50 +10:00 |
|
Rohan Mitchell
|
2a630a855a
|
Move primary taxon field into Rob's new product form
|
2014-05-29 09:28:08 +10:00 |
|
summerscope
|
614b25c446
|
Applying new icon font to footer partial on homepage
|
2014-05-28 17:06:52 +10:00 |
|
summerscope
|
3f36a3785b
|
Adding in icon for list style from new OFN icon font
|
2014-05-28 17:06:34 +10:00 |
|
summerscope
|
6ea7988f4e
|
New version fonts
|
2014-05-28 17:06:06 +10:00 |
|
Rohan Mitchell
|
09ce8697af
|
Only trigger taxon search AJAX when column visible - fixes deadlocks in specs
|
2014-05-28 16:55:04 +10:00 |
|
summerscope
|
d3802e9f83
|
Applying new icon font to map partial on homepage
|
2014-05-28 16:43:06 +10:00 |
|
summerscope
|
4c832b6ae9
|
Applying new icon font to producers partial on homepage
|
2014-05-28 16:39:26 +10:00 |
|
summerscope
|
7185aa6ab6
|
Applying new icon font to groups partial on homepage
|
2014-05-28 16:38:01 +10:00 |
|
summerscope
|
8954caf3e0
|
Applying new icon font to active table on homepage
|
2014-05-28 16:33:01 +10:00 |
|
summerscope
|
0c2a7ac247
|
Adding style sheet to allow access to custom font
|
2014-05-28 16:32:37 +10:00 |
|
summerscope
|
1e0aec0267
|
Adding in font files for custom font
|
2014-05-28 16:32:10 +10:00 |
|
Will Marshall
|
4b1f409774
|
Only rendering images that exist{
|
2014-05-28 16:19:10 +10:00 |
|
Will Marshall
|
98b4fe27f6
|
Hiding group logo if not present
|
2014-05-28 16:12:13 +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
|
33829d9044
|
Only rendering images if they exist
|
2014-05-28 16:03:42 +10:00 |
|
Will Marshall
|
9bb059493e
|
Fixing the image render
|
2014-05-28 16:03:42 +10:00 |
|
Will Marshall
|
b8cc9d3343
|
Modding image sizing on groups
|
2014-05-28 16:03:42 +10:00 |
|
Will Marshall
|
f65ff5af18
|
Automatically sorting out image rotation
|
2014-05-28 16:03:42 +10:00 |
|