merge front code

lxerxa · May 28, 2018 · e54c8a9 · e54c8a9
1 parent 53485a7
commit e54c8a9
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 32 deletions.
diff --git a/public/assets/24-8871bf43a5b7abde2f86.js → public/assets/24-d7ef91d5e5ae6760c2ce.js b/public/assets/24-8871bf43a5b7abde2f86.js → public/assets/24-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/25-8871bf43a5b7abde2f86.js → public/assets/25-d7ef91d5e5ae6760c2ce.js b/public/assets/25-8871bf43a5b7abde2f86.js → public/assets/25-d7ef91d5e5ae6760c2ce.js
diff --git a/...c/assets/activity-8871bf43a5b7abde2f86.js → ...c/assets/activity-d7ef91d5e5ae6760c2ce.js b/...c/assets/activity-8871bf43a5b7abde2f86.js → ...c/assets/activity-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/config-8871bf43a5b7abde2f86.js → public/assets/config-d7ef91d5e5ae6760c2ce.js b/public/assets/config-8871bf43a5b7abde2f86.js → public/assets/config-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/events-8871bf43a5b7abde2f86.js → public/assets/events-d7ef91d5e5ae6760c2ce.js b/public/assets/events-8871bf43a5b7abde2f86.js → public/assets/events-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/field-8871bf43a5b7abde2f86.js → public/assets/field-d7ef91d5e5ae6760c2ce.js b/public/assets/field-8871bf43a5b7abde2f86.js → public/assets/field-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/group-8871bf43a5b7abde2f86.js → public/assets/group-d7ef91d5e5ae6760c2ce.js b/public/assets/group-8871bf43a5b7abde2f86.js → public/assets/group-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/issue-8871bf43a5b7abde2f86.js → public/assets/issue-d7ef91d5e5ae6760c2ce.js b/public/assets/issue-8871bf43a5b7abde2f86.js → public/assets/issue-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/kanban-8871bf43a5b7abde2f86.js → public/assets/kanban-d7ef91d5e5ae6760c2ce.js b/public/assets/kanban-8871bf43a5b7abde2f86.js → public/assets/kanban-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/module-8871bf43a5b7abde2f86.js → public/assets/module-d7ef91d5e5ae6760c2ce.js b/public/assets/module-8871bf43a5b7abde2f86.js → public/assets/module-d7ef91d5e5ae6760c2ce.js
diff --git a/.../assets/mysetting-8871bf43a5b7abde2f86.js → .../assets/mysetting-d7ef91d5e5ae6760c2ce.js b/.../assets/mysetting-8871bf43a5b7abde2f86.js → .../assets/mysetting-d7ef91d5e5ae6760c2ce.js
diff --git a/...c/assets/priority-8871bf43a5b7abde2f86.js → ...c/assets/priority-d7ef91d5e5ae6760c2ce.js b/...c/assets/priority-8871bf43a5b7abde2f86.js → ...c/assets/priority-d7ef91d5e5ae6760c2ce.js
diff --git a/...ic/assets/project-8871bf43a5b7abde2f86.js → ...ic/assets/project-d7ef91d5e5ae6760c2ce.js b/...ic/assets/project-8871bf43a5b7abde2f86.js → ...ic/assets/project-d7ef91d5e5ae6760c2ce.js
diff --git a/...assets/resolution-8871bf43a5b7abde2f86.js → ...assets/resolution-d7ef91d5e5ae6760c2ce.js b/...assets/resolution-8871bf43a5b7abde2f86.js → ...assets/resolution-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/role-8871bf43a5b7abde2f86.js → public/assets/role-d7ef91d5e5ae6760c2ce.js b/public/assets/role-8871bf43a5b7abde2f86.js → public/assets/role-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/screen-8871bf43a5b7abde2f86.js → public/assets/screen-d7ef91d5e5ae6760c2ce.js b/public/assets/screen-8871bf43a5b7abde2f86.js → public/assets/screen-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/state-8871bf43a5b7abde2f86.js → public/assets/state-d7ef91d5e5ae6760c2ce.js b/public/assets/state-8871bf43a5b7abde2f86.js → public/assets/state-d7ef91d5e5ae6760c2ce.js
diff --git a/...ic/assets/summary-8871bf43a5b7abde2f86.js → ...ic/assets/summary-d7ef91d5e5ae6760c2ce.js b/...ic/assets/summary-8871bf43a5b7abde2f86.js → ...ic/assets/summary-d7ef91d5e5ae6760c2ce.js
diff --git a/...assets/syssetting-8871bf43a5b7abde2f86.js → ...assets/syssetting-d7ef91d5e5ae6760c2ce.js b/...assets/syssetting-8871bf43a5b7abde2f86.js → ...assets/syssetting-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/team-8871bf43a5b7abde2f86.js → public/assets/team-d7ef91d5e5ae6760c2ce.js b/public/assets/team-8871bf43a5b7abde2f86.js → public/assets/team-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/type-8871bf43a5b7abde2f86.js → public/assets/type-d7ef91d5e5ae6760c2ce.js b/public/assets/type-8871bf43a5b7abde2f86.js → public/assets/type-d7ef91d5e5ae6760c2ce.js
diff --git a/public/assets/user-8871bf43a5b7abde2f86.js → public/assets/user-d7ef91d5e5ae6760c2ce.js b/public/assets/user-8871bf43a5b7abde2f86.js → public/assets/user-d7ef91d5e5ae6760c2ce.js
diff --git a/...ic/assets/version-8871bf43a5b7abde2f86.js → ...ic/assets/version-d7ef91d5e5ae6760c2ce.js b/...ic/assets/version-8871bf43a5b7abde2f86.js → ...ic/assets/version-d7ef91d5e5ae6760c2ce.js
diff --git a/...c/assets/wfconfig-8871bf43a5b7abde2f86.js → ...c/assets/wfconfig-d7ef91d5e5ae6760c2ce.js b/...c/assets/wfconfig-8871bf43a5b7abde2f86.js → ...c/assets/wfconfig-d7ef91d5e5ae6760c2ce.js
diff --git a/...c/assets/workflow-8871bf43a5b7abde2f86.js → ...c/assets/workflow-d7ef91d5e5ae6760c2ce.js b/...c/assets/workflow-8871bf43a5b7abde2f86.js → ...c/assets/workflow-d7ef91d5e5ae6760c2ce.js
diff --git a/public/scripts/app.js b/public/scripts/app.js
diff --git a/public/scripts/common.js b/public/scripts/common.js