Merge branch 'main' into issue--OWASP-BLT#1358

JisanAR03 · Oct 31, 2023 · 28b3894 · 28b3894
2 parents 2aae3a1 + f27ce8f
commit 28b3894
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 13 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -53,7 +53,7 @@ django-tz-detect = "^0.4.0"
 django-tellme = "^0.7.3"
 django-bootstrap-datepicker-plus = "^5.0.4"
 django-star-ratings = "^0.9.2"
-stripe = "^7.0.0"
+stripe = "^7.1.0"
 django-environ = "^0.11.2"
 django-humanize = "^0.1.2"
 drf-yasg = "^1.20.0"

diff --git a/website/static/css/style-dashboard.css b/website/static/css/style-dashboard.css
@@ -5846,7 +5846,7 @@ p.date-in, span.date-on{
 .tile-progress {
   padding: 15px;
 }
-i.fa.fa-facebook, i.fa.fa-twitter, i.fa.fa-google-plus, i.fa.fa-dribbble, i.fa.fa-linkedin, i.fa.fa-youtube, i.fa.fa-skype, i.fa.fa-flickr{
+i.fa.fa-facebook, i.fa.fa-x-twitter, i.fa.fa-google-plus, i.fa.fa-dribbble, i.fa.fa-linkedin, i.fa.fa-youtube, i.fa.fa-skype, i.fa.fa-flickr{
   font-size: 30px;
 }
 h3.count.text-light {

diff --git a/website/static/js/jquery.atwho.js b/website/static/js/jquery.atwho.js
@@ -786,7 +786,7 @@
                 }
             }
             if ($query.length > 0 && (query_content = $query.attr('data-atwho-at-query'))) {
-                $query.empty().html(query_content).attr('data-atwho-at-query', null);
+                $query.empty().text(query_content).removeAttr('data-atwho-at-query');
                 this._setRange('after', $query.get(0), range);
             }
             _range = range.cloneRange();

diff --git a/website/templates/contributors_detail.html b/website/templates/contributors_detail.html
@@ -33,7 +33,7 @@
                 >
                 <a href="{{contributor.twitter}}" target="_blank" rel="noopener noreferrer">
                     <i
-                    class="scale-150 m-3 fa-brands fa-twitter fa-lg cursor-pointer transition duration-100 hover:text-red-500"
+                    class="scale-150 m-3 fa-brands fa-x-twitter fa-lg cursor-pointer transition duration-100 hover:text-red-500"
                     ></i>
                 </a>
                 <a href="{{contributor.linkedin}}" target="_blank" rel="noopener noreferrer">
@@ -53,4 +53,4 @@
       </div>
     </div>
   </section>
-{% endblock %}
+{% endblock %}
diff --git a/website/templates/index3.html b/website/templates/index3.html
@@ -58,7 +58,7 @@
                                 Share
                             </button>
                             <button class="m-1 md:m-0 flex items-center px-10 h-14 rounded-xl border-[1px] border-gray-300 font-extrabold hover:text-red-500 hover:bg-gray-100">
-                                <i class="fa-brands fa-twitter text-2xl mr-2"> </i>
+                                <i class="fa-brands fa-x-twitter text-2xl mr-2"> </i>
                                 Tweet
                             </button>
                             <button class="m-1 md:m-0 flex items-center px-10 h-14 rounded-xl border-[1px] border-gray-300 font-extrabold hover:text-red-500 hover:bg-gray-100">

diff --git a/website/templates/issue.html b/website/templates/issue.html
@@ -198,7 +198,7 @@ <h3 class="page-header">
                 </span>
             {% endif %}
 
-            <a class="tweet-btn fa fa-twitter btn btn-xs tweet-btn"
+            <a class="tweet-btn fa fa-x-twitter btn btn-xs tweet-btn"
                 href="https://twitter.com/intent/tweet?text=Bug on @{{ object.domain_title }} - {{ object.description }}"
                 data-size="small"> Tweet</a>
             <span class="fb-share-button"

diff --git a/website/templates/issue2.html b/website/templates/issue2.html
@@ -71,7 +71,7 @@
                                 target="_blank"
                                 href="https://twitter.com/intent/tweet?text=Bug Found on @{{ object.domain_title }} - {{ object.description }} Report: https://{% env 'FQDN' %}/issue/{{ object.id }}"
                                 class="flex items-center px-10 h-14 rounded-xl border-[1px] border-gray-300 font-extrabold hover:text-red-500 hover:bg-gray-100 m-5 xl:m-0">
-                                <i class="fa-brands fa-twitter text-2xl mr-2"> </i>
+                                <i class="fa-brands fa-x-twitter text-2xl mr-2"> </i>
                                 Share
                             </a>