Matt-Yorkley
cd55d2e2ff
Product Description - strip weird tags on paste
...
squashme
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b04d815408
Changes for code review
...
Fixed spec
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b38eab11eb
Fixed frontend HTML display
2017-04-05 11:29:35 +10:00
Matt-Yorkley
c43dea60b7
Product Descriptions formatting
2017-04-05 11:29:35 +10:00
Keir Osborn
209c9242d9
remove word-wrap class from enterprise.email_address and enterprise.website in javascripts/templates/partials/contact.html.haml
2017-03-24 12:55:30 +11:00
Matt-Yorkley
cc5a335fb7
Refactor and additional permissions checks
...
Don't include non-permitted enterprises in existin product count
Tweaked feedback
2017-03-17 16:11:52 +11:00
Matt-Yorkley
91fc3f33a0
PI reset and save step improvements
2017-03-17 16:11:52 +11:00
Matt-Yorkley
24fcc3dd34
PI reset absent products
2017-03-17 16:11:52 +11:00
Matt-Yorkley
14fb40a996
Product Import options and defaults
...
Added available_on test
Obscure case fix and extra spec
2017-03-17 16:11:52 +11:00
Matt-Yorkley
3d0f192490
Product Import update
2017-03-17 16:11:52 +11:00
François Turbelin
be6b09a6e0
Adding i18n keys on JS templates
2017-03-12 12:22:13 +01:00
Rob Harrington
4815405839
WIP: Moving registration templates in app/views as partials
2017-02-22 13:40:17 +11:00
Matt-Yorkley
beaf54107c
Moved angular template to views folder
2017-02-22 13:40:17 +11:00
Matt-Yorkley
bc442c7819
Re-adding a line removed in testing
2017-02-22 13:40:17 +11:00
Matt-Yorkley
6a361f2d7b
Specced the new terms of service functionality
2017-02-22 13:40:17 +11:00
Matt-Yorkley
a62998e5f1
Enterprise Terms of Service
2017-02-22 13:40:17 +11:00
Continuous Integration
5870927518
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-10 16:42:27 +11:00
Continuous Integration
a2d01b5144
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-08 16:53:53 +11:00
Rob Harrington
8afd5c509b
Using coffescript syntax to check for presence of enterprise_form
2017-02-08 15:59:11 +11:00
Matt-Yorkley
311f72e4cb
Fixing JS spec failure
2017-02-08 15:59:11 +11:00
Matt-Yorkley
78563a7d75
Changed for build failure
2017-02-08 15:59:11 +11:00
Matt-Yorkley
9284dd9b63
Enable save after deleting enterprise manager
2017-02-08 15:59:11 +11:00
Maikel Linke
b8622e95b7
Re-use NavigationCheck logic
...
The enterprise switcher now uses the same code as NavigationCheck to
confirm leaving a changed form. This makes FormState obsolete.
Conflicts:
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2017-02-02 10:58:32 +11:00
Continuous Integration
f8341dccd4
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-01 10:35:53 +11:00
Matt-Yorkley
27903ab744
Merge branch 'master' into uk/switcher
2017-01-22 18:57:25 +00:00
Matt-Yorkley
931e528e14
Code review changes
2017-01-22 18:55:28 +00:00
Paul Mackay
165b437f31
#1226 : fix OSM URL to use HTTPS
2017-01-20 15:59:22 +00:00
Continuous Integration
a391b6f076
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 11:12:17 +11:00
Matt-Yorkley
5150025641
Updated tag rules UI
2017-01-10 22:54:22 +00:00
Levent Ali
6ae1272281
Mark order cycle form as dirty when removing fees
...
Resolves an issue where removing coordinator/exchange fees
wasn't allowing users to save the OC.
Fixes #1165
2016-12-23 09:33:34 +11:00
Lynne Davis
d77f775c4c
Moving commits from 1241 to trigger build on UK staging
2016-12-19 15:06:43 +00:00
Matt-Yorkley
287e0b5b55
Enterprise switcher and navigation check
2016-12-09 15:15:42 +00:00
Matt-Yorkley
7d7197da58
Reordered enterprises submenu
2016-12-09 14:31:34 +00:00
Matt-Yorkley
7981feefa1
Updated form to include help tip for clarity
2016-11-28 14:38:13 +00:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Rob Harrington
27283c50b8
Customers service clears array fo each #index request
2016-11-25 12:43:48 +11:00
Rob Harrington
5e214a32b3
Moving ShippingMethods service to admin.resource module
2016-11-25 11:59:00 +11:00
Rob Harrington
7498b7f098
Moving PaymentMethods service to admin.resource module
2016-11-25 11:57:59 +11:00
Rob Harrington
268c8dbcdd
Moving Customers and CustomerResource services to admin.resource module
2016-11-25 11:46:51 +11:00
Rob Harrington
dbbd52cace
Fixing broken taxons filter on bulk product edit
...
Was referencing Taxons.taxons instead of Taxons.all
2016-11-25 10:37:01 +11:00
Rob Harrington
1770a67cd9
Adding #load function to services for resources, for generic loading of data into byID and pristineByID
2016-11-25 10:37:01 +11:00
Rob Harrington
3678d4d018
Creating new 'resources' module for holding interdependent ngResource services
2016-11-25 10:37:01 +11:00
Rob Harrington
3de69987e6
Changing convention for angular resource services to generic 'byID' object and 'all' array
2016-11-25 10:37:01 +11:00
Rob Harrington
cbbb047fc1
Expunge all mentions of includeBlank and blankOption from angular services
2016-11-25 10:37:01 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Continuous Integration
a115f2a268
Merge remote-tracking branch 'origin/master' into HEAD
2016-11-23 15:00:02 +11:00
Maikel Linke
c0c8b07add
Let shopping tabs listen to URL changes
...
When clicking on a shopping tab like "contact", it changed the URL. But
changing the URL did not change the tab. Listening to URL changes
enables manual manipulation of the URL and simple links to "#/contact"
to open the contact tab.
2016-11-11 17:11:39 +11:00
Rob Harrington
db93b74490
Refactoring ofnSelect2, works with multiple, and with promised data
2016-11-04 09:39:17 +11:00
Rohan Mitchell
d574b8943b
WIP: Cherry-pick b2d82b6 - Using ofnSelect2 instead of plain select on BOM
2016-11-04 09:39:17 +11:00
Rohan Mitchell
3e565ad7cb
Mark admin enterprises form dirty when property removed
2016-11-04 09:39:17 +11:00
