Skip to content

Commit

Permalink
Merge d95740a into 1aa5c98
Browse files Browse the repository at this point in the history
  • Loading branch information
@javrasya
javrasya committed Mar 17, 2020
2 parents 1aa5c98 + d95740a commit e0b852d
Show file tree
Hide file tree
Showing 25 changed files with 3,541 additions and 3,685 deletions.
2 changes: 1 addition & 1 deletion README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Getting Started
Requirements
------------

* `django-river`_ >= 3.0.0
* `django-river`_ >= 3.2.0
* Any ``Python`` version that is supported by `django-river`_
* Any ``Django`` version that is supported by `django-river`_
* Any browser that is supported by `Vuetify`_ (`Browser Support`_)
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Getting Started
Requirements
------------

* `django-river`_ >= 3.0.0
* `django-river`_ >= 3.2.0
* Any ``Python`` version that is supported by `django-river`_
* Any ``Django`` version that is supported by `django-river`_
* Any browser that is supported by `Vuetify`_ (`Browser Support`_)
Expand Down
2 changes: 1 addition & 1 deletion examples/issue_tracker_example/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('river', '0012_auto_20191113_1550'),
('river', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]

Expand Down
2 changes: 1 addition & 1 deletion examples/shipping_example/migrations/0001_initial.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class Migration(migrations.Migration):
initial = True

dependencies = [
('river', '0012_auto_20191113_1550'),
('river', '0001_initial'),
]

operations = [
Expand Down
2 changes: 2 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
},
"dependencies": {
"@mdi/font": "^4.4.95",
"acorn": "^7.1.1",
"axios": "^0.19.0",
"core-js": "^2.6.5",
"d3-tip": "^0.9.1",
"dagre-d3": "^0.6.3",
"minimist": "^1.2.2",
"serialize-javascript": "^2.1.2",
"vue": "^2.6.10",
"vue-codemirror": "^4.0.6",
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mock==2.0.0
pyhamcrest==1.9.0
djangorestframework
django-cors-headers
django-river>=3.0.0
django-river>=3.2.0
django-heroku
psycopg2
gunicorn
Expand Down
7 changes: 0 additions & 7 deletions river_admin/static/css/chunk-vendors.466e3e3d.css
View file

This file was deleted.

7 changes: 7 additions & 0 deletions river_admin/static/css/chunk-vendors.f492b4c3.css
View file

Large diffs are not rendered by default.

Binary file renamed .../materialdesignicons-webfont.a32fa1f2.eot → .../materialdesignicons-webfont.2d0a0d8f.eot
View file
Binary file not shown.
Binary file removed river_admin/static/fonts/materialdesignicons-webfont.7ec5dab7.woff2
View file
Binary file not shown.
Binary file removed river_admin/static/fonts/materialdesignicons-webfont.a0d13d16.woff
View file
Binary file not shown.
Binary file added river_admin/static/fonts/materialdesignicons-webfont.b4917be2.woff
View file
Binary file not shown.
Binary file added river_admin/static/fonts/materialdesignicons-webfont.d0066537.woff2
View file
Binary file not shown.
Binary file renamed .../materialdesignicons-webfont.3ac50b5b.ttf → .../materialdesignicons-webfont.f5111234.ttf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions river_admin/static/js/app.bc99fe15.js → river_admin/static/js/app.c242e207.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion river_admin/static/js/app.bc99fe15.js.map → river_admin/static/js/app.c242e207.js.map
View file

Large diffs are not rendered by default.

1,635 changes: 0 additions & 1,635 deletions river_admin/static/js/chunk-vendors.f025a741.js
View file

This file was deleted.

1 change: 0 additions & 1 deletion river_admin/static/js/chunk-vendors.f025a741.js.map
View file

This file was deleted.

1,834 changes: 1,834 additions & 0 deletions river_admin/static/js/chunk-vendors.f424dfd5.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions river_admin/static/js/chunk-vendors.f424dfd5.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion river_admin/templates/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>River Admin - Shiny Workflow Admin</title><link href=/static/css/app.d7a88b58.css rel=preload as=style><link href=/static/css/chunk-vendors.466e3e3d.css rel=preload as=style><link href=/static/js/app.bc99fe15.js rel=preload as=script><link href=/static/js/chunk-vendors.f025a741.js rel=preload as=script><link href=/static/css/chunk-vendors.466e3e3d.css rel=stylesheet><link href=/static/css/app.d7a88b58.css rel=stylesheet></head><body><noscript><strong>We're sorry but River Admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f025a741.js></script><script src=/static/js/app.bc99fe15.js></script></body></html>
<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>River Admin - Shiny Workflow Admin</title><link href=/static/css/app.d7a88b58.css rel=preload as=style><link href=/static/css/chunk-vendors.f492b4c3.css rel=preload as=style><link href=/static/js/app.c242e207.js rel=preload as=script><link href=/static/js/chunk-vendors.f424dfd5.js rel=preload as=script><link href=/static/css/chunk-vendors.f492b4c3.css rel=stylesheet><link href=/static/css/app.d7a88b58.css rel=stylesheet></head><body><noscript><strong>We're sorry but River Admin doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.f424dfd5.js></script><script src=/static/js/app.c242e207.js></script></body></html>
143 changes: 13 additions & 130 deletions ui/tests/unit/components/__snapshots__/ApprovalDetail.spec.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,7 @@ exports[`ApprovalDetail.vue should emit event on deleting the approval 1`] = `
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -128,16 +119,7 @@ exports[`ApprovalDetail.vue should emit event on deleting the approval 2`] = `
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -199,16 +181,7 @@ exports[`ApprovalDetail.vue should not render dragging icon when it is not edita
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -292,16 +265,7 @@ exports[`ApprovalDetail.vue should not render groups lane when the group list is
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -385,16 +349,7 @@ exports[`ApprovalDetail.vue should not render permissions lane when the permissi
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -456,16 +411,7 @@ exports[`ApprovalDetail.vue should not render settings button if not editable 1`
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -527,16 +473,7 @@ exports[`ApprovalDetail.vue should not render the buttons in the settings as def
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -620,16 +557,7 @@ exports[`ApprovalDetail.vue should render approval icon correctly 1`] = `
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -713,16 +641,7 @@ exports[`ApprovalDetail.vue should render dragging icon when it is editable 1`]
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -863,16 +782,7 @@ exports[`ApprovalDetail.vue should render groups lane when the group list is not
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -1013,16 +923,7 @@ exports[`ApprovalDetail.vue should render permissions lane when the permission l
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -1106,16 +1007,7 @@ exports[`ApprovalDetail.vue should render settings button if editable 1`] = `
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;
Expand Down Expand Up @@ -1199,16 +1091,7 @@ exports[`ApprovalDetail.vue should render title correctly 1`] = `
class="v-dialog__container"
role="dialog"
>
<div
class="v-dialog__content"
role="document"
style="z-index: 0;"
>
<div
class="v-dialog"
style="max-width: 800px; display: none;"
/>
</div>
<!---->
</div>
</div>
`;

0 comments on commit e0b852d

Please sign in to comment.