Commit Graph

842 Commits

Author SHA1 Message Date
Mike Jolley 747a6d51d1 Update mini cart after back button page load
Fixes #11646
2016-08-10 11:35:44 +01:00
Mike Jolley 3f93886cb9 Merge pull request #11628 from JeroenSormani/patch-1
Focus on modal, enable esc-close + init tooltips
2016-08-05 15:45:18 +01:00
Mike Jolley 559e379faf Issues after audit 2016-08-05 14:23:01 +01:00
Jeroen Sormani 052a277400 Focus on modal, enable esc-close + init tooltips
When opening the modal it doesn't allow you to close it with the ESC key unless you click on the modal first.
Focussing on the modal when its loaded resolves that.

Also adding tooltip initialisation so tooltips will show if they are present. I don't believe core is using tooltips in there right now, but I guess its useful for the future / 3rd party devs that may have a use for it (like me)
2016-08-05 14:15:38 +02:00
Mike Jolley c61c08f405 Merge branch 'master' into tax-rate-auto-ordering
# Conflicts:
#	assets/css/admin.css
2016-08-04 14:06:52 +01:00
Mike Jolley 8e6ca3effe Merge pull request #11107 from helgatheviking/sortable-select2
add drag and drop support to select2 inputs. closes #11106
2016-08-04 11:32:46 +01:00
Mike Jolley e271825ffb Merge branch 'master' into tax-rate-auto-ordering
# Conflicts:
#	assets/css/admin.css
2016-08-02 14:17:23 +01:00
Mike Jolley 0fbb38c034 Fix instance link in zones screen 2016-08-02 11:26:48 +01:00
Mike Jolley 0d6a3af108 Remove sorting function 2016-07-27 10:22:02 +01:00
Mike Jolley 72a5f9a9d1 Maintain method_order sorting for zones in list
Closes #11486
2016-07-21 14:30:05 +01:00
Mike Jolley 4e83d45491 POT and min 2016-07-19 18:08:45 +01:00
Claudio Sanches e5186aef9a Fixed coding standards and improved #11439 2016-07-19 08:42:19 -03:00
Mike Jolley d7c0b0f2fe Merge pull request #11439 from charlestonsoftware/master
Resolved issue #11428.
2016-07-19 13:37:08 +02:00
Mike Jolley 53511e36ec Use permission id to revoke access to downloads to prevent removing wrong rows.
Fixes #11423 @claudiosmweb
2016-07-14 15:54:28 +02:00
Claudio Sanches 09ac79e7e1 Minify files 2016-07-14 15:48:11 +02:00
Lance Cleveland a74c1e3aa7 Resolved issue #11428.
report.js export_csv of the 'table' data_format will not download if the cell data contains #.   Most likely due to the fact that #<id> is a octect character.

This is a quick fix that strips any # character from table cell data.

There may be a way to escape # however \# nor HTML encoding to %23 resolved the issue.
2016-07-14 08:18:56 -04:00
Claudio Sanches cf622677ad Minify 2016-06-28 14:39:08 -03:00
Claudio Sanches 8c4d406866 Fixed coding standards 2016-06-28 14:38:19 -03:00
Mike Jolley 0a8e219c9d Hide empty panels 2016-06-28 11:56:45 +01:00
Mike Jolley 6649500b79 Merge branch 'group-notices-11226'
# Conflicts:
#	assets/js/frontend/checkout.min.js
2016-06-24 16:01:03 +01:00
Mike Jolley 117990d95f Merge branch 'pr/11219'
# Conflicts:
#	assets/js/frontend/cart.min.js
2016-06-24 12:39:47 +01:00
Mike Jolley b9eb873229 minify 2016-06-24 12:28:50 +01:00
Jon Brim 1848f63254 Fixed: Blank Exporting Reports
Fix for #11236 adjusted the DOM to the new tree structure in html-report-by-date.php
2016-06-23 09:08:50 -07:00
Mike Jolley e1ec01c9f9 Zone wording tweaks
Closes #11184
2016-06-20 12:50:55 +01:00
Kathy Darling e670dc202b use data attribute data-sortable to toggle sorting 2016-06-13 15:01:15 -05:00
Kathy Darling 995b809cce add drag and drop support to select2 inputs. closes #11106 2016-06-13 13:47:03 -05:00
Mike Jolley eae9638276 Minify 2016-06-10 14:55:01 +01:00
Shiva Poudel 8b0f2b3a42 Save changes class won't exist, so no need to trigger save event 2016-06-10 18:00:45 +05:45
Mike Jolley 83eab2344e Hide blank slate on add zone 2016-06-07 16:18:32 +01:00
Claudio Sanches e39274e753 HTTPS for everybody 2016-05-26 22:48:49 -03:00
Claudio Sanches 1d37b9f4e7 Minify 2016-05-25 13:57:30 -03:00
Mike Jolley 22291e3ead Generate a zone name if left blank
@coderkevin
2016-05-24 18:59:35 +01:00
Mike Jolley 3893d0ec19 Fixes tokenisation form when > 1 are used at once.
@claudiosmweb can you give this a check over since it was missed?
2016-05-24 17:52:32 +01:00
Mike Jolley 5d6db7a294 Hide blank slate on add
Fixes #10967
2016-05-24 12:49:32 +01:00
Mike Jolley 54231c2946 Allow shipping classes interface to be extended. 2016-05-19 12:38:28 +01:00
Mike Jolley 9d1c425952 combined logic 2016-05-17 14:08:23 +01:00
Caleb Burks e7635df4d0 Minify 2016-05-16 17:18:10 -05:00
Caleb Burks b2d33f00e8 Order change/keyup price function
on change then keyup for each item. OCD issues
2016-05-16 17:06:05 -05:00
Caleb Burks d37f191833 Add decimal error and fix for refund amount 2016-05-16 17:04:38 -05:00
Claudio Sanches 06dbc81d66 Always prevent default/return false #10907 2016-05-12 16:48:06 -03:00
Mike Jolley 5f46f60cb0 Merge pull request #10907 from corsonr/confirm_delete_order_note
Add order note deletion confirmation
2016-05-12 12:26:26 +01:00
Mike Jolley 986bd5abc7 Fix save and striping 2016-05-12 12:18:35 +01:00
Mike Jolley 8be8fe4c8a Use modal for adding methods on both screens 2016-05-12 11:29:33 +01:00
corsonr 52f3cb3d8a Add order note deletion confirmation 2016-05-12 10:04:32 +02:00
Mike Jolley aa3dab3572 Resize modal content dynamically
Fixes #10896
2016-05-11 16:19:22 +01:00
Mike Jolley 2cc0ac294e Fix return on add_metadata
Fixes #10892
2016-05-11 15:28:40 +01:00
Shiva Poudel 4c7a78ab31 Tweak - Use of single backbone modal script for shipping and order panel 2016-05-08 21:34:05 +05:45
Mike Jolley b39ec6b2d6 Fix undo on storefront
Closes #10816
2016-05-03 17:03:46 +01:00
Mike Jolley b98b07e1cd Merge pull request #10836 from Slayvin/quick-edit-format-price
Quick edit format price fix
2016-05-03 12:07:04 +01:00
Mike Jolley c6975fa7d5 Merge branch 'pr/10750' 2016-05-03 12:01:09 +01:00