Merge branch 'master' into features/sleekplan-PROD

# Conflicts: # src/app/app.module.ts # src/app/components/navbar/navbar.component.html # src/app/components/navbar/navbar.component.scss # src/app/components/navbar/navbar.component.ts # src/assets/css/demo.scss
Tiledesk · Dec 12, 2024 · 36ca781 · 36ca781
2 parents 64fc34c + a146d79
commit 36ca781
Show file tree

Hide file tree

Showing 238 changed files with 14,578 additions and 6,035 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 # tiledesk-dashboard
 
+### 2.7.47
+- Fixes the bug: Knowledge Base menu item displays with a delay
+
+### 2.7.46
+- Adds in Analytics > Metrics the conversations tags graph
+- Improves the UI of the sidebar
+
+### 2.7.46-rc6
+- Adds in Analytics > Metrics the conversations tags graph
+- Improves the UI of the sidebar
+
+### 2.7.45
+- Improves the app store
+
+### 2.7.44
+- Improves the method manage integrations visibility
+- Improves the method that display the runned out quotas banner
+
+### 2.7.43
+- Adds the "Twilio voice" integration 
+
 ### 2.7.42
 - Adds the ability to add the webhook subscriptions "Request Abandoned" and "Request Fully Abandoned"
 

diff --git a/deploy_prod.sh b/deploy_prod.sh
@@ -17,10 +17,10 @@ aws cloudfront create-invalidation --distribution-id E2D4FS8NGUODM4 --paths "/*"
 echo new version deployed on s3://panel.tiledesk.com/v3/dashboard/
 echo available on https://panel.tiledesk.com/v3/dashboard/index.html
 
-# aws s3 sync --cache-control max-age=172800 . s3://panel.tiledesk.com/v3/dashboard/ps
+# aws s3 sync --cache-control max-age=172800 . s3://panel.tiledesk.com/v3/dashboard/snx
 # aws cloudfront create-invalidation --distribution-id E2D4FS8NGUODM4 --paths "/*"
-# echo new version deployed on s3://panel.tiledesk.com/v3/dashboard/ps
-# echo available on https://panel.tiledesk.com/v3/dashboard/ps/index.html
+# echo new version deployed on s3://panel.tiledesk.com/v3/dashboard/snx
+# echo available on https://panel.tiledesk.com/v3/dashboard/snx/index.html
 
 
 

diff --git a/documentation/tutorial-components.html b/documentation/tutorial-components.html
@@ -1602,7 +1602,7 @@ <h2 class="text-center">How to setup Google API Keys</h2>
 
 </body>
 	<!--   Core JS Files   -->
-	<script src="./js/jquery-3.5.0.min.js"></script>
+	<script src="./js/jquery-3.2.1.min.js"></script>
 	<script src="./js/bootstrap.min.js" type="text/javascript"></script>
 	<script src="./js/material.min.js" type="text/javascript"></script>
 	<script src="./js/arrive.min.js" type="text/javascript"></script>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tiledesk/tiledesk-dashboard",
-  "version": "2.7.42",
+  "version": "2.7.47",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --aot",
@@ -45,7 +45,7 @@
     "@types/grecaptcha": "^3.0.7",
     "angular-cc-library": "^3.0.0",
     "angular-shepherd": "^14.0.0",
-    "apexcharts": "^3.36.0",
+    "apexcharts": "^4.1.0",
     "arrive": "2.4.1",
     "bootstrap": "^3.4.0",
     "bootstrap-material-design": "0.5.10",

diff --git a/src/app/activities/activities.component.html b/src/app/activities/activities.component.html
@@ -1,14 +1,14 @@
 <!-- margin-top:6px; -->
-<p style="z-index: 1050;position: relative; padding-left:30px" class="navbar-brand"
+<p style="z-index: 1050;position: relative; padding-left:40px" class="navbar-brand"
   [ngStyle]="{'margin-top':isChromeVerGreaterThan100 === true ? '-64px' : '6px' }">
   {{ "Activities" | translate }}
 </p>
-<div class="main-content" style="padding-top:0px">
+<div class="main-content" style="padding-top:0px; padding-left: 15px;">
   <div class="container-fluid">
 
     <div class="row">
       <div class="col-md-12">
-        <div class="card filter-card" style="margin-bottom: 0px;">
+        <div class="card filter-card" style="margin-bottom: 0px; border-radius: 12px;">
           <!-- padding-top: 0px;padding-bottom: 0px; -->
           <div class="card-content">
 
@@ -87,15 +87,19 @@
             <div style="margin-top:15px">
               <div class="row">
                 <div class="col-sm-12">
-                  <button #searchbtn type="submit" class="btn btn-white" (click)="search()" style="padding:9px 30px;">
-                    <span class="glyphicon glyphicon-search" aria-hidden="true" style="color:#7695a5"></span>
-                  </button>
+                  <div class="actvity-btn-wpr">  
+
 
-                  <button #clearsearchbtn type="submit" class="btn btn-white clearsearchbtn" (click)="clearSearch()"
-                    style="padding:9px 30px;color:#7695a5">
-                    <!-- <span class="glyphicon glyphicon-remo" aria-hidden="true"></span> -->
-                    {{ 'HistoryPage.ClearSearch' | translate }}
-                  </button>
+                    <button #clearsearchbtn type="submit" class="btn btn-gray-no-boxshadow clearsearchbtn" (click)="clearSearch()">
+                      <!-- <span class="glyphicon glyphicon-remo" aria-hidden="true"></span> -->
+                      {{ 'HistoryPage.ClearSearch' | translate }}
+                    </button>
+
+                    <button #searchbtn type="submit" class="btn btn-tdblu-no-boxshadow search-btn" (click)="search()">
+                      <span class="glyphicon glyphicon-search" aria-hidden="true"></span>
+                      {{'Search' | translate}}
+                    </button>
+                  </div>
 
                   <!-- <button #exportcsvbtn class="btn btn-white pull-right export-to-csv-btn" (click)="exportActivitiesAsCSV()"
                     style="padding:9px 30px;color:#7695a5">
@@ -113,7 +117,7 @@
 
     <div class="row">
       <div class="col-md-12">
-        <div class="card" style="margin-top: 0px;">
+        <div class="card" style="margin-top: 0px;border-radius: 12px;">
 
           <div class="sort-by-date" style="text-align:right; padding-top:16px; padding-right:28px">
             <span style="cursor: pointer" (click)="sortDirection(asc = !asc)">
@@ -548,29 +552,29 @@
           </div>
 
           <div class="card-footer" style="text-align:right">
-            <div class="stats">
-              <div style="width: 120px; margin: 0 auto; margin-top: 10px ">
+            <div class="pagination-wpr">
+              <div class="pagination">
                 <div class="input-group">
 
                   <!-- -------====== BTN DECREASE PAGE  ======------ -->
                   <span class="input-group-btn" style="padding-right:0px;  padding-left: 0px;">
-                    <button [disabled]="pageNo + 1 === 1" class="btn btn-info" type="button"
-                      (click)="decreasePageNumber()" style="padding: 6px 8px">
+                    <button [disabled]="pageNo + 1 === 1" class="btn btn-tdblu-no-boxshadow" type="button"
+                      (click)="decreasePageNumber()" style="border-bottom-right-radius: 0px !important; border-top-right-radius: 0px !important;">
                       <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
                     </button>
                   </span>
 
                   <!-- -------====== DISPLAY No PAGE / No TOTAL PAGES   ======------ -->
-                  <span class="input-group-btn" style="padding-right:0px;">
-                    <button class="btn btn-info" type="button" style="padding: 6px 8px">
+                  <span class="input-group-btn" style="padding-right:0px; padding-left: 0px;">
+                    <button class="btn btn-tdblu-no-boxshadow" type="button" style="border-radius: 0px !important;">
                       {{ pageNo + 1 }} / {{ totalPagesNo_roundToUp }}
                     </button>
                   </span>
 
                   <!-- -------====== BTN INCREASE PAGE  ======------ -->
-                  <span class="input-group-btn" style="padding-right:0px">
+                  <span class="input-group-btn" style="padding-right:0px;  padding-left: 0px;">
                     <button [disabled]="pageNo + 1 === totalPagesNo_roundToUp || totalPagesNo_roundToUp === 0"
-                      class="btn btn-info" type="button" (click)="increasePageNumber()" style="padding: 6px 8px">
+                      class="btn btn-tdblu-no-boxshadow" type="button" (click)="increasePageNumber()" style="border-bottom-left-radius: 0px !important; border-top-left-radius: 0px !important;">
                       <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
                     </button>
                   </span>