fix conflicts

2021-08-09 13:18:57 +00:00
parent d1753d7529 27bcb76fd7
commit 55fae3b1f4
55 changed files with 2214 additions and 899 deletions
--- a/resources/assets/js/api/Services.js
+++ b/resources/assets/js/api/Services.js
@@ -69,5 +69,8 @@
    CATEGORIES: "/home/categories",
    DEBUG_STATUS: "/home/process-debug-status?processUid={prj_uid}",
    CONFIG: "/home/config",
-    GET_CONFIG: "/home/config/{id}/{name}"
+    GET_CONFIG: "/home/config/{id}/{name}",
+    PAUSE_CASE: "/cases/{app_uid}/pause",
+    REASSIGN_CASE: "/cases/{app_uid}/reassign-case",
+    REASSIGN_USERS: "/light/userstoreassign/{task_uid}"
 };