Skip to content

Commit

Permalink
Merge pull request #612 from nearbeach/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
robotichead authored May 13, 2024
2 parents 35fe326 + b95bd01 commit 30da273
Show file tree
Hide file tree
Showing 264 changed files with 1,005 additions and 336 deletions.
49 changes: 46 additions & 3 deletions NearBeach/fixtures/NearBeach_basic_setup.json
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@
"date_created": "2023-02-17T09:48:05.023Z",
"date_modified": "2023-02-17T09:48:05.024Z",
"change_user": 1,
"is_deleted": false
"is_deleted": true
}
},
{
Expand Down Expand Up @@ -1959,6 +1959,33 @@
"is_deleted": false
}
},
{
"model": "NearBeach.objectassignment",
"pk": 34,
"fields": {
"assigned_user": 1,
"group_id": null,
"requirement": 1,
"requirement_item": null,
"project": null,
"task": null,
"kanban_board": null,
"kanban_card": null,
"request_for_change": null,
"customer": null,
"organisation": null,
"change_task": null,
"meta_object": null,
"meta_object_title": "",
"meta_object_status": "",
"link_relationship": "",
"parent_link": "",
"date_created": "2024-05-13T08:35:50.388Z",
"date_modified": "2024-05-13T08:35:50.388Z",
"change_user": 1,
"is_deleted": false
}
},
{
"model": "NearBeach.objectnote",
"pk": 1,
Expand Down Expand Up @@ -4764,7 +4791,7 @@
"pk": 1,
"fields": {
"password": "pbkdf2_sha256$720000$xBoXxSEeVXBdR0rm6efbo0$//JuZL1sOsIXbgd6qdboRpMTz0MgwRi9Oi5AsuaSVx8=",
"last_login": "2024-03-18T08:45:08.034Z",
"last_login": "2024-05-13T08:35:31.081Z",
"is_superuser": true,
"username": "admin",
"first_name": "Admin",
Expand All @@ -4782,7 +4809,7 @@
"pk": 2,
"fields": {
"password": "pbkdf2_sha256$720000$qPwbmUsqdz96LSSCZoFdkm$yT30PhvOS91E/Jn/ZS0fstZYzWLSgvzLHLhJc8V4xSg=",
"last_login": "2024-02-05T08:08:56.971Z",
"last_login": "2024-05-13T08:35:38.559Z",
"is_superuser": false,
"username": "team_leader",
"first_name": "Team",
Expand Down Expand Up @@ -5309,6 +5336,14 @@
"expire_date": "2024-02-17T00:52:51.968Z"
}
},
{
"model": "sessions.session",
"pk": "922i2920gbdv4xctpizrk8pypiaysael",
"fields": {
"session_data": ".eJxVjEEOwiAQRe_C2hAYoNQu3XsGwgyDrZrWQFkZ726bdKHb_95_bxFiW8fQKpcwJTEILU6_G0Z68LyDdI_zbZG0zGuZUO6KPGiV1yXx83K4f4Ex1nF7O0Ai68FFdqlPkdH1nBUmC-SzNqAUeaMMGtuBBsAz6q7LtrfaGqdoi0411PbismfFsJbGny-LGT7k:1s6R9f:Bnve0zi8T7R8BLUIPjW7DFbBUFWSyOuRHKDjTJhqJKw",
"expire_date": "2024-05-27T08:35:31.102Z"
}
},
{
"model": "sessions.session",
"pk": "bjg85wdarjo3cgh7m5n5ghtyuml55cpw",
Expand All @@ -5325,6 +5360,14 @@
"expire_date": "2023-06-07T11:22:43.278Z"
}
},
{
"model": "sessions.session",
"pk": "jf4rxb43g0qzwg0jblkwjg2xqtoz0ope",
"fields": {
"session_data": ".eJxVjjsOwjAQRO_iGln-yklKes5gjb1rEkAJipMKcXewlALaeTNP8xIR-zbGvfIaJxKDMOL0myXkO88N0A3zdZF5mbd1SrJV5EGrvCzEj_PR_ROMqON3nYKzSoOSt9YA1rJP8KZouD4HogJCVlmHYgz3Fsjadz5rx0oF17VXU411f_LatGIoeFR-fwDnpUAT:1s6R9m:qyY_lFApfV6G3NPniA1Nzshbmg-FY9fJYvUlZu5IFRs",
"expire_date": "2024-05-27T08:35:38.574Z"
}
},
{
"model": "sessions.session",
"pk": "kml4rul4ztacc8rth3cm01bw5x5i983r",
Expand Down
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/NearBeach.min.js

Large diffs are not rendered by default.

36 changes: 34 additions & 2 deletions NearBeach/static/NearBeach/NearBeach.min.js.LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
/*!
* Bootstrap v5.3.0 (https://getbootstrap.com/)
* Copyright 2011-2023 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Bootstrap v5.3.3 (https://getbootstrap.com/)
* Copyright 2011-2024 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/

/*! #__NO_SIDE_EFFECTS__ */

/**
* @vue/compiler-core v3.4.19
* (c) 2018-present Yuxi (Evan) You and Vue contributors
* @license MIT
**/

/**
* @vue/reactivity v3.4.19
* (c) 2018-present Yuxi (Evan) You and Vue contributors
* @license MIT
**/

/**
* @vue/runtime-core v3.4.19
* (c) 2018-present Yuxi (Evan) You and Vue contributors
* @license MIT
**/

/**
* @vue/runtime-dom v3.4.19
* (c) 2018-present Yuxi (Evan) You and Vue contributors
* @license MIT
**/

/**
* @vue/shared v3.4.19
* (c) 2018-present Yuxi (Evan) You and Vue contributors
* @license MIT
**/
Binary file modified NearBeach/static/NearBeach/NearBeach.min.js.LICENSE.txt.gz
Binary file not shown.
Binary file modified NearBeach/static/NearBeach/NearBeach.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/change-task-information.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/change-task-information.min.js.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion NearBeach/static/NearBeach/change-task-modules.min.js

Large diffs are not rendered by default.

Binary file modified NearBeach/static/NearBeach/change-task-modules.min.js.gz
Binary file not shown.

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

Binary file not shown.

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

Binary file modified NearBeach/static/NearBeach/confirm-kanban-board-reopen.min.js.gz
Binary file not shown.
Loading

0 comments on commit 30da273

Please sign in to comment.