Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/stable'
Browse files Browse the repository at this point in the history
  • Loading branch information
@thelostone-mc
thelostone-mc committed Feb 10, 2021
2 parents b757dfe + be2422c commit 1636764
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion app/app/templates/shared/sentry.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
{% endcomment %}
{% if raven_js_dsn %}
<script src="https://cdn.ravenjs.com/{{ raven_js_version|default_if_none:'3.26.4' }}/raven.min.js" crossorigin="anonymous"></script>
<script src="https://cdn.ravenjs.com/{{ raven_js_version|default_if_none:'3.26.4' }}/raven.min.js" ></script>
<script>
var ravenOptions = {
release: '{{ release }}',
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/mautic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class MauticEvent {
// let dataMock = this.dataMock(data)

fetch(contactApi, {
method: 'PUT',
method: 'PATCH',
headers: {
'Accept': 'application/json',
'Content-Type': 'application/json'
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/management/commands/sync_pending_fulfillments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def handle(self, *args, **options):
if qr_pending_fulfillments:
# Auto expire pending transactions
timeout_period = timezone.now() - timedelta(minutes=20)
qr_pending_fulfillments.filter(created_on__lt=timeout_period).update(payout_status='expired')
qr_pending_fulfillments.filter(modified_on__lt=timeout_period).update(payout_status='expired')

fulfillments = qr_pending_fulfillments.filter(payout_status='pending')
for fulfillment in fulfillments.all():
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4932,7 +4932,7 @@ class BlockedIP(SuperModel):

def __str__(self):
"""Return the string representation of a BlockedIP."""
return f'<BlockedIP: {self.ip_address}>'
return f'<BlockedIP: {self.addr}>'


class Sponsor(SuperModel):
Expand Down
8 changes: 4 additions & 4 deletions app/dashboard/templates/dashboard/hackathon/onboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,9 @@ <h4 class="font-header font-weight-bold pt-0 mb-5">{{ question.text }}{{ questio
const sendRegister = fetchData(url, 'POST', data, {'X-CSRFToken': csrftoken});

$('[data-registration]').attr('disabled', true);
$.when(sendRegister).then((response) => {
$.when(sendRegister).then(async(response) => {

sendMtcEvent(name)
await sendMtcEvent(name)
_alert('You have now registered for this hackathon.', 'success');
document.location.href = response.redirect;
})
Expand All @@ -532,8 +532,8 @@ <h4 class="font-header font-weight-bold pt-0 mb-5">{{ question.text }}{{ questio
const sendRegister = fetchData(url, 'POST', data, {'X-CSRFToken': csrftoken});

$('#poll-submit').attr('disabled', true);
$.when(sendRegister).then((response) => {
sendMtcEvent(name)
$.when(sendRegister).then(async(response) => {
await sendMtcEvent(name)
_alert('You have now registered for this hackathon.', 'success');
console.log(response)
document.location.href = response.redirect;
Expand Down
10 changes: 5 additions & 5 deletions app/dashboard/templates/ftux/avatar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@ <h3 id="section-title">
{% if ids|length > 1 %}
<div class="category {{category}} {% if category != 'background' %}hidden{% endif %}">
{% for id in ids %}
<img class=tdselection data-id="{{id}}"
data-src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"
data-altsrc="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"
{% if category == 'background' %}src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"{%endif%}>
<img class=tdselection data-id="{{id}}"
data-src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"
data-altsrc="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"
{% if category == 'background' %}src="/avatar/view3d?mode=preview&ids={{id}}&theme={{theme}}"{%endif%}>
{% endfor %}
</div>
{% endif %}
Expand All @@ -251,7 +251,7 @@ <h3 id="section-title">
{% endif %}

<script src="{% static "v2/js/lib/jquery.js" %}"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
<script>
var profileId = '{{ profile_id }}';
var options = {
Expand Down
2 changes: 1 addition & 1 deletion app/grants/templates/grants/faq.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ <h5 class="accordion font-subheader">Where can I see my Grant contribution histo
</div>
</div>
</section>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
2 changes: 1 addition & 1 deletion app/grants/templates/grants/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
<script src="{% static "v2/js/grants/index.js" %}"></script>
<script src="{% static "v2/js/grants/funding.js" %}"></script>
<script src="{% static "v2/js/lib/popper.min.js" %}"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
</body>


Expand Down
2 changes: 1 addition & 1 deletion app/inbox/templates/inbox.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,6 @@
{% include 'shared/analytics.html' %}
{% include 'shared/footer_scripts.html' with slim=1 %}
<script src="{% static "v2/js/lib/popper.min.js" %}"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
</body>
</html>
6 changes: 3 additions & 3 deletions app/ptokens/templates/shared/ptokens_buy_faq.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ <h5 class="accordion">Where do I see a user’s time token?</h5>
<div class="mb-3 faq-item">
<h5 class="accordion">How do I use a time token?</h5>
<div class="panel">
<p>Once you’ve acquired a time token, you’ll need to submit a redemption request.
This request can be used on any of the Creators listed uses, and only for those uses.
<p>Once you’ve acquired a time token, you’ll need to submit a redemption request.
This request can be used on any of the Creators listed uses, and only for those uses.
Please note that it’s up to the creator to determine whether or not your request is appropriate, so please give them 24-48 hours to respond to your request.</p>
</div>
</div>
Expand All @@ -56,4 +56,4 @@ <h5 class="accordion">A Creator accepted my request and did not meet my expectat
</div>
</div>

<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
6 changes: 3 additions & 3 deletions app/ptokens/templates/shared/ptokens_faq.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ <h5 class="accordion">Where do I see a user’s time token?</h5>
<div class="mb-3 faq-item">
<h5 class="accordion">How do I use a time token?</h5>
<div class="panel">
<p>Once you’ve acquired a time token, you’ll need to submit a redemption request.
This request can be used on any of the Creators listed uses, and only for those uses.
<p>Once you’ve acquired a time token, you’ll need to submit a redemption request.
This request can be used on any of the Creators listed uses, and only for those uses.
Please note that it’s up to the creator to determine whether or not your request is appropriate, so please give them 24-48 hours to respond to your request.</p>
</div>
</div>
Expand All @@ -57,4 +57,4 @@ <h5 class="accordion">A Creator accepted my request and did not meet my expectat
</div>
</div>
</section>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
2 changes: 1 addition & 1 deletion app/ptokens/templates/shared/ptokens_make_faq.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ <h5 class="accordion">What happens when I accept a request?</h5>
</div>
</div>

<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
4 changes: 2 additions & 2 deletions app/retail/templates/email_unsubscribed.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ <h6 class="mt-4">{% trans 'Unsubscribe Successful' %}</h6>

<!-- jQuery -->
<script src="{% static "v2/js/lib/popper.min.js" %}"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
</html>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
</html>
16 changes: 8 additions & 8 deletions app/retail/templates/emails/recap/weekly_founder_recap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{% load i18n humanize %}
{% load static %}
{% block content %}
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" >
<style type="text/css">
.g-icon {
width: 1em;
Expand Down Expand Up @@ -63,13 +63,13 @@
color: #C70018;
border-color: #D2D2D2;
}

.bold {
font-weight: bold;
}
.header {
/*width: 100%;*/
border-bottom: 1px solid;
border-bottom: 1px solid;
margin-top: 3em;
}
.leftAlign {
Expand All @@ -82,7 +82,7 @@
.imgGitcoinStyle {
max-height:50px; max-width:100%; border:2px solid #1AB56D; border-radius:100%;
}
.contentOverall {
.contentOverall {
padding-bottom: 3em;
padding-top: 1em;
}
Expand All @@ -91,7 +91,7 @@
}
.section_row_entry {
padding-bottom: 1.5em;

}
body {
background-color: #f2f6f9;
Expand All @@ -101,7 +101,7 @@
justify-content: center; /* align horizontal */
align-items: center; /* align vertical */
}

@media (max-width: 576px) {
.middlecenter-2 {
display: flex;
Expand All @@ -110,7 +110,7 @@
}
}
@media (min-width: 576px) {

.middlecenter-2 {
text-align: left;
align-items: left;
Expand All @@ -127,7 +127,7 @@
<h2>{% trans "Your weekly bounties recap" %}</h2>
<div>{{ select_params.to }} - {{ select_params.from }}</div>
<div class="bold">{{profile.handle}}</div>

{% for section in sections %}
<div class="{{section.header_css}} header leftAlign">
<i class="g-icon g-icon__dot-circle"></i>&nbsp;{{section.header_name}}
Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/shared/footer_scripts.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

{% include 'shared/sentry.html' %}
<script src="{% static "v2/js/lib/popper.min.js" %}"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
<script src="{% static "v2/js/lib/bootstrap-vue.min.js" %}"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>

Expand Down
2 changes: 1 addition & 1 deletion app/retail/templates/shared/footer_scripts_lite.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
{% endif %}
{% include 'shared/sentry.html' %}
<script src="{% static "v2/js/lib/popper.min.js" %}"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" crossorigin="anonymous"></script>
<script src="{% static "v2/js/lib/bootstrap.min.js" %}" ></script>
<script src="{% static "v2/js/lib/bootstrap-vue.min.js" %}"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]"></script>

Expand Down
6 changes: 3 additions & 3 deletions app/retail/templates/shared/head.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<meta charset="utf-8">
<link rel="preload" href="{% static "v2/css/base.css" %}" as="style">
<link rel="preload" href="{% static "v2/css/gitcoin.css" %}" as="style">
<link rel="preload" href="{% static "v2/css/bootstrap.min.css" %}" as="style" crossorigin="anonymous">
<link rel="preload" href="{% static "v2/css/bootstrap.min.css" %}" as="style" >
<link rel="preload" href="{% static "v2/css/top-nav.css" %}" as="style">
<link rel="preload" href="{% static "v2/css/fontawesome-all.min.css" %}" as="style">
<link rel="preload" href="{% static "v2/css/lib/typography.css" %}" as="style">
Expand All @@ -30,11 +30,11 @@
<link rel="preload" href="{% static "v2/fonts/muli/muli-v12-latin-600.woff2" %}" as="font" type="font/woff2" crossorigin>
<link rel="preload" href="{% static "v2/fonts/muli/muli-v12-latin-700.woff2" %}" as="font" type="font/woff2" crossorigin>

<link rel="preload" href="{% static "v2/js/lib/bootstrap.min.js" %}" as="script" crossorigin="anonymous">
<link rel="preload" href="{% static "v2/js/lib/bootstrap.min.js" %}" as="script" >

<link rel="sitemap" type="application/xml" title="Sitemap" href="/sitemap.xml" />
<link rel="stylesheet" href="{% static "v2/css/search.css" %}">
<link rel="stylesheet" href="{% static "v2/css/bootstrap.min.css" %}" crossorigin="anonymous">
<link rel="stylesheet" href="{% static "v2/css/bootstrap.min.css" %}" >
<link rel="stylesheet" href='{% static "v2/css/bootstrap-vue.min.css" %}'/>
<link rel="stylesheet" href="{% static "v2/css/lib/typography.css" %}">
<link rel="stylesheet" href="{% static "v2/css/fontawesome-all.min.css" %}">
Expand Down

0 comments on commit 1636764

Please sign in to comment.