* [new] Drag and drop sortability added to the task

* [update] Task color scheme. * [update] Activity graph color scheme in my task section. * [update] Single task redirection in my task section. * [update] Project duplication. * [update] Project overview section. * [fix] Grid/List view action on project listing is not working. * [fix] Project overview graph is not working. * [fix] Not all users of a project is being duplicated when duplicating a project. * [fix] Notification is sent to the co-workers when a project is created. * [fix] Unable to comment in a task when it is redirected from current task in my task. * [fix] Unable to comment in a task when it is redirected from outstanding task in mytask. * [fix] Unable to comment in a task when it is redirected from competed task in my task. * [fix] User selection is not working in my task. * [fix] Date section is not working in activity graph in my task. * [fix] Red color is showing for current task in my task. * [fix] Overview section in my task is not working * [fix] Activity section in my task is not working * [fix] Current task section in my task is not working * [fix] Outstanding task section in my task is not working * [fix] Completed task section in my task is not working * [fix] File attachment is not working when commenting in the file section of a project. * [fix] Unable to delete a comment in the file section of a project. * [fix] Commenting in a discussion board is not working. * [fix] Editing a comment in a discussion board is not working. * [fix] Deleting a comment in a discussion board is not working. * [fix] Javascript shows error when commenting, editing comments and deleting comments in discussion board.
weDevsOfficial · Jun 7, 2017 · d09002f · d09002f
2 parents 10697be + adb12e7
commit d09002f
Show file tree

Hide file tree

Showing 47 changed files with 2,060 additions and 1,330 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,4 +10,5 @@ includes/pro
 build
 secret.json
 .netbeans.xml
-npm-debug.log
+npm-debug.log
+.svnignore
diff --git a/.svnignore b/.svnignore
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -77,6 +77,7 @@ module.exports = function(grunt) {
                     '!**/Gruntfile.js',
                     '!**/package.json',
                     '!**/README.md',
+                    '!**/customs.json',
                     '!nbproject',
                     '!**/*~'
                 ],

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -1303,7 +1303,6 @@ ul.cpm-activity ul li:before {
 .cpm-new-todolist-form,
 .cpm-update-todolist-form {
   border: 1px solid #e5e5e5;
-  width: 40%;
   background: #fff;
   margin-top: 20px;
   box-shadow: 0 1px 1px rgba(0, 0, 0, 0.04);
@@ -1314,6 +1313,16 @@ ul.cpm-activity ul li:before {
   padding: 5px;
   margin: 0;
 }
+.cpm-new-todolist-form {
+  width: 40%;
+}
+.cpm-update-todolist-form {
+  width: 50%;
+}
+.cpm-update-todolist-form .cpm-new-todolist-form {
+  margin: 0px;
+  width: 100%;
+}
 .cpm-single-task {
   margin: 20px 0;
   border-bottom: 1px solid #eee;
@@ -1577,7 +1586,7 @@ ul.cpm-activity ul li:before {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  background: #CD7A7A;
+  background: #EB5A46;
   font-size: 12px;
   line-height: 12px;
   padding: 1px 7px;
@@ -1587,10 +1596,20 @@ ul.cpm-activity ul li:before {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
-  background: #ddd;
+  background: #61BD4F;
   font-size: 12px;
   line-height: 1.3em;
-  color: #999;
+  color: #fff;
+  padding: 2px 5px;
+}
+.cpm-task-done {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  background: #0090D9;
+  font-size: 12px;
+  line-height: 1.3em;
+  color: #fff;
   padding: 2px 5px;
 }
 .cpm-task-comment-count {
@@ -2036,14 +2055,14 @@ ul.cpm-files li .cpm-file-action .comment-number {
   position: relative;
 }
 .cpm-calendar a.cpm-expire-task {
-  background-color: #a30 !important;
+  background-color: #EB5A46 !important;
 }
 .cpm-calendar a.cpm-task-running {
-  background-color: #1abc9c !important;
+  background-color: #61BD4F !important;
 }
 .cpm-calendar a.cpm-complete-task {
   text-decoration: line-through;
-  background-color: #3498db !important;
+  background-color: #0090D9!important;
   text-decoration: line-through !important;
 }
 .cpm-calendar span.fc-event-title {
@@ -4438,3 +4457,201 @@ ul.cpm-files li .cpm-file-action .comment-number {
   list-style: disc;
   padding-left: 20px;
 }
+.cpm-single-new-task-field-wrap {
+  position: relative;
+}
+.cpm-single-new-task-field-wrap .cpm-settings {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+}
+.cpm-single-new-task-field-wrap .cpm-settings-control {
+  position: absolute;
+  background: #deb;
+  padding: 6px;
+  border-radius: 3px;
+  top: 0px;
+  z-index: 9999;
+  width: 100%;
+}
+.cpm-single-new-task-field-wrap .cpm-settings-control .cpm-triangle {
+  position: absolute;
+  width: 0;
+  height: 0;
+  top: 8px;
+}
+.cpm-single-new-task-field-wrap-right .cpm-settings-control {
+  left: 104%;
+}
+.cpm-single-new-task-field-wrap-right .cpm-settings-control .cpm-triangle {
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+  border-right: 10px solid #deb;
+  left: -9px;
+}
+.cpm-single-new-task-field-wrap-left .cpm-settings-control {
+  right: 34px;
+}
+.cpm-single-new-task-field-wrap-left .cpm-settings-control .cpm-triangle {
+  border-top: 10px solid transparent;
+  border-bottom: 10px solid transparent;
+  border-left: 10px solid #deb;
+  right: -9px;
+}
+.cpm-single-task-field-multiselect-wrap .cpm-multiselect,
+.cpm-todo-lists-drop-down-wrap .cpm-multiselect {
+  position: relative;
+}
+.cpm-single-task-field-multiselect-wrap .cpm-multiselect .cpm-multiselect-cross,
+.cpm-todo-lists-drop-down-wrap .cpm-multiselect .cpm-multiselect-cross {
+  position: absolute;
+  z-index: 9999;
+  right: 5px;
+  top: 7px;
+}
+.cpm-single-task-field-multiselect-wrap .cpm-multiselect .multiselect__tags,
+.cpm-todo-lists-drop-down-wrap .cpm-multiselect .multiselect__tags {
+  border: none;
+  padding: 0;
+}
+.cpm-single-task-field-multiselect-wrap .cpm-multiselect .multiselect__select,
+.cpm-todo-lists-drop-down-wrap .cpm-multiselect .multiselect__select {
+  display: none;
+}
+.cpm-popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1060;
+  display: block;
+  max-width: 276px;
+  padding: 1px;
+  font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
+  font-style: normal;
+  font-weight: 400;
+  letter-spacing: normal;
+  line-break: auto;
+  line-height: 1.5;
+  text-align: left;
+  text-align: start;
+  text-decoration: none;
+  text-shadow: none;
+  text-transform: none;
+  white-space: normal;
+  word-break: normal;
+  word-spacing: normal;
+  font-size: .875rem;
+  word-wrap: break-word;
+  background-color: #fff;
+  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  border-radius: .3rem;
+  margin-left: 10px;
+  opacity: 1;
+  padding: 10px;
+  width: 270px;
+}
+.cpm-popover .cpm-arrow {
+  top: 74px;
+  left: -20px;
+  content: " ";
+  border-width: 10px;
+  position: absolute;
+  display: block;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+  border-right-color: #999;
+}
+.cpm-popover .cpm-arrow::after {
+  top: -10px;
+  left: -9px;
+  content: " ";
+  border-left-width: 0;
+  border-width: 10px;
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+  border-right-color: #fff;
+}
+.cpm-popover-title {
+  padding: 8px 14px;
+  margin-bottom: 0;
+  font-size: 1rem;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  border-top-right-radius: calc(-0.7rem);
+  border-top-left-radius: calc(-0.7rem);
+}
+.cpm-popover-content {
+  padding: 9px 14px;
+}
+.cpm-single-task-field-start-wrap,
+.cpm-single-task-field-end-wrap,
+.cpm-single-task-field-description-wrap {
+  position: relative;
+  width: 100%;
+}
+.cpm-single-task-field-start-wrap .cpm-single-task-field-description-link,
+.cpm-single-task-field-end-wrap .cpm-single-task-field-description-link,
+.cpm-single-task-field-description-wrap .cpm-single-task-field-description-link {
+  position: absolute;
+  right: 5px;
+  top: 4px;
+}
+.cpm-single-task-field-start-wrap .cpm-single-task-field-start-field,
+.cpm-single-task-field-end-wrap .cpm-single-task-field-start-field,
+.cpm-single-task-field-description-wrap .cpm-single-task-field-start-field,
+.cpm-single-task-field-start-wrap .cpm-single-task-field-end-field,
+.cpm-single-task-field-end-wrap .cpm-single-task-field-end-field,
+.cpm-single-task-field-description-wrap .cpm-single-task-field-end-field,
+.cpm-single-task-field-start-wrap .cpm-single-task-field-description-field,
+.cpm-single-task-field-end-wrap .cpm-single-task-field-description-field,
+.cpm-single-task-field-description-wrap .cpm-single-task-field-description-field {
+  width: 100%;
+  border-radius: 3px;
+  margin-bottom: 5px;
+}
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-from,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-from,
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-to,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-to {
+  position: relative;
+}
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-from .ui-datepicker,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-from .ui-datepicker,
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-to .ui-datepicker,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-to .ui-datepicker {
+  width: 16em;
+  /*what ever width you want*/
+}
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-from i,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-from i,
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-to i,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-to i {
+  font-size: 20px;
+  background: #444;
+  color: #fff;
+  border-radius: 8px;
+  height: 20px;
+  width: 20px;
+  text-align: center;
+  font-weight: 100 !important;
+}
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-from .cpm-single-task-field-start-link,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-from .cpm-single-task-field-start-link,
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-to .cpm-single-task-field-start-link,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-to .cpm-single-task-field-start-link,
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-from .cpm-single-task-field-end-link,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-from .cpm-single-task-field-end-link,
+.cpm-single-task-field-start-wrap .cpm-inline-date-picker-to .cpm-single-task-field-end-link,
+.cpm-single-task-field-end-wrap .cpm-inline-date-picker-to .cpm-single-task-field-end-link {
+  position: absolute;
+  right: -5px;
+  top: -12px;
+  z-index: 99999;
+}
diff --git a/assets/css/bootstrap/bootstrap.min.css b/assets/css/bootstrap/bootstrap.min.css
diff --git a/assets/css/bootstrap/index.css b/assets/css/bootstrap/index.css