Skip to content

Commit

Permalink
Merge pull request #59 from smartdevicelink/develop
Browse files Browse the repository at this point in the history
Patch 2.3.2
  • Loading branch information
nickschwab authored Mar 29, 2018
2 parents ccbcbf4 + 3d2d9d5 commit b94c7a6
Show file tree
Hide file tree
Showing 28 changed files with 78 additions and 2,770 deletions.
2 changes: 1 addition & 1 deletion dist/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><title>sdl_policy_server</title><link href=/static/css/app.b4c1c11195c516a966492978c74a619f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.dd94d54f26c44c06dca3.js></script><script type=text/javascript src=/static/js/vendor.8c3ac23cbf69f494abd9.js></script><script type=text/javascript src=/static/js/app.8162b9739615534f2b7c.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><title>sdl_policy_server</title><link href=/static/css/app.9658628b7447e21bc898973dcdb8cb4a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.0b938f75334f6c4f74be.js></script><script type=text/javascript src=/static/js/vendor.4049d8530123e6411404.js></script><script type=text/javascript src=/static/js/app.2dd7d37b8c5a7aea87a6.js></script></body></html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

2 changes: 2 additions & 0 deletions dist/static/js/app.2dd7d37b8c5a7aea87a6.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/static/js/app.2dd7d37b8c5a7aea87a6.js.map

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions dist/static/js/app.8162b9739615534f2b7c.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/static/js/app.8162b9739615534f2b7c.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions dist/static/js/manifest.0b938f75334f6c4f74be.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions dist/static/js/manifest.dd94d54f26c44c06dca3.js

This file was deleted.

25 changes: 25 additions & 0 deletions dist/static/js/vendor.4049d8530123e6411404.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/static/js/vendor.4049d8530123e6411404.js.map

Large diffs are not rendered by default.

48 changes: 0 additions & 48 deletions dist/static/js/vendor.8c3ac23cbf69f494abd9.js

This file was deleted.

1 change: 0 additions & 1 deletion dist/static/js/vendor.8c3ac23cbf69f494abd9.js.map

This file was deleted.

6 changes: 3 additions & 3 deletions documentation/docs/Policy Table/Application Policies/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ An example of how the Application Policy portion of a policy table might look.
"memory_kb": 5,
"watchdog_timer_ms": 55
},
"663645645": "null",
"773692255": "default",
"584421907": {
"[App ID 1]": "null",
"[App ID 2]": "default",
"[App ID 3]": {
"nicknames": [ "Awesome Music App" ],
"keep_context": true,
"steal_focus": true,
Expand Down
4 changes: 2 additions & 2 deletions documentation/docs/Policy Table/Device Data/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ User consent(s) can also be saved per application on a device under a property n
An example of how the Device Data portion of a policy table might look.

"device_data": {
"UEI17A73JH32L41K32JH4L1K234H3K4HUU40DAS7F970": {
"[ID VALUE HERE]": {
"hardware": "iPhone 4S",
"max_number_rfcom_ports": 25,
"firmware_rev": null,
Expand All @@ -52,7 +52,7 @@ An example of how the Device Data portion of a policy table might look.
"input": "VUI",
"time_stamp": "4/24/2012 12:30:00 PM"
},
"584421907": {
"[APP ID HERE]": {
"consent_groups": {
"Location-1": true,
"DrivingData-1": false
Expand Down
2 changes: 1 addition & 1 deletion documentation/docs/Policy Table/Usage and Errors/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ An example of how the Usage and Error portion of a policy table might look.
"usage_and_error_counts": {
"count_of_iap_buffer_full": 1,
"app_level": {
"584421907": {
"[App ID Here]": {
"app_registration_language_gui": "en-us",
"app_registration_language_vui": "en-us",
"count_of_rejected_rpcs_calls": 9,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sdl_policy_server",
"version": "2.3.1",
"version": "2.3.2",
"license": "BSD-3-Clause",
"description": "Integrates with SHAID to allow managing app permissions through policy tables",
"author": "Livio",
Expand Down Expand Up @@ -47,6 +47,7 @@
"vue-ladda": "0.0.13",
"vue-resource": "1.3.4",
"vue-router": "2.7.0",
"vue-scrollto": "2.11.0",
"vue-session": "0.9.10",
"winston": "2.3.1",
"xml2js": "0.4.19"
Expand Down
Loading

0 comments on commit b94c7a6

Please sign in to comment.