Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update the trademark_squatting_field to allow reporting issues with trademark squatting #3194

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1013cf4
fix: #907
drvcodenta Jan 4, 2025
3cdaf12
Merge branch 'main' into 907
DonnieBLT Jan 19, 2025
7126f6d
Merge branch 'main' into 907
drvcodenta Jan 21, 2025
769354e
Issue 2972 added refrash feature 2 (#3204)
JisanAR03 Jan 5, 2025
30c8af5
chore(deps): Bump unstructured from 0.16.11 to 0.16.12
dependabot[bot] Jan 6, 2025
5091384
chore(deps-dev): Bump ruff from 0.8.4 to 0.8.6
dependabot[bot] Jan 6, 2025
ca66aa1
feat: add ContributorStats model for tracking contributor activity (#…
JisanAR03 Jan 6, 2025
111433f
Comments on blog (#3195)
krrish-sehgal Jan 8, 2025
a9f64be
feat: add ContributorStats admin interface and template for displayin…
JisanAR03 Jan 9, 2025
12ea267
chore(deps-dev): Bump ruff from 0.8.6 to 0.9.0
dependabot[bot] Jan 10, 2025
8d9334e
chore(deps): Bump pydantic from 2.10.4 to 2.10.5
dependabot[bot] Jan 10, 2025
d0a8b6b
feat: add ProjectBadgeView and RepoBadgeView for tracking project and…
JisanAR03 Jan 10, 2025
a2670dc
feat: add badges for project and repository view counts with copy fun…
JisanAR03 Jan 11, 2025
ff9fa7f
enhance IP address retrieval for project and repo badge view
JisanAR03 Jan 12, 2025
1eaecfd
update project URL to new project url and remove unused views (#3218)
JisanAR03 Jan 12, 2025
d5ec86c
chore(deps-dev): Bump ruff from 0.9.0 to 0.9.1
dependabot[bot] Jan 13, 2025
71ffbbb
enhance invitation feature with email notifications and referral link…
JisanAR03 Jan 13, 2025
7bf3d07
chore(deps): Bump django-environ from 0.11.2 to 0.12.0
dependabot[bot] Jan 14, 2025
b86dbc6
chore(deps): Bump unstructured from 0.16.12 to 0.16.13
dependabot[bot] Jan 14, 2025
6d41b67
chore(deps): Bump django from 5.1.4 to 5.1.5
dependabot[bot] Jan 14, 2025
e21d8a9
chore(deps): Bump sentry-sdk from 2.19.2 to 2.20.0
dependabot[bot] Jan 15, 2025
c3dfcbe
add a script for import new project (#3227)
JisanAR03 Jan 15, 2025
3d7b0c0
chore(deps): Bump scout-apm from 3.2.1 to 3.3.0
dependabot[bot] Jan 16, 2025
4850c0d
chore(deps): Bump django-import-export from 4.3.3 to 4.3.4
dependabot[bot] Jan 16, 2025
d4008b4
chore(deps): Bump tweepy from 4.14.0 to 4.15.0
dependabot[bot] Jan 16, 2025
5cbcf82
chore(deps-dev): Bump ruff from 0.9.1 to 0.9.2
dependabot[bot] Jan 17, 2025
61b933a
Add schedule management commands (#3237)
SahilDhillon21 Jan 17, 2025
7d076f6
feat(slack): add Slack event handling for team joins and messages (#3…
JisanAR03 Jan 18, 2025
13fdcff
test(slack): add unit tests for Slack message handling functions (#3240)
JisanAR03 Jan 19, 2025
c90870a
team overview dashboard (#3233)
SahilDhillon21 Jan 19, 2025
278a8ed
Anonymous can post suggestions and Improved UI (#3158)
tsu-ki Jan 19, 2025
6fa86ad
Creating slack-bot for OWASP slack workspace (#3145)
tsu-ki Jan 19, 2025
ab1a059
chore(deps): Bump django-simple-captcha from 0.6.0 to 0.6.1
dependabot[bot] Jan 20, 2025
3322c01
chore(deps): Bump unstructured from 0.16.13 to 0.16.14
dependabot[bot] Jan 21, 2025
889e4b9
chore(deps): Bump selenium from 4.27.1 to 4.28.0
dependabot[bot] Jan 21, 2025
5471644
Merge branch '907' of https://github.com/drvcodenta/BLT into 907
drvcodenta Jan 21, 2025
654f4aa
Merge conflicting migrations
drvcodenta Jan 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions website/migrations/0179_alter_issue_label.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Generated by Django 5.1.4 on 2025-01-04 18:06

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("website", "0178_alter_ip_agent"),
]

operations = [
migrations.AlterField(
model_name="issue",
name="label",
field=models.PositiveSmallIntegerField(
choices=[
(0, "General"),
(1, "Number Error"),
(2, "Functional"),
(3, "Performance"),
(4, "Security"),
(5, "Typo"),
(6, "Design"),
(7, "Server Down"),
(8, "Trademark Squatting"),
],
default=0,
),
),
]
13 changes: 13 additions & 0 deletions website/migrations/0181_merge_20250121_1617.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Generated by Django 5.1.4 on 2025-01-21 16:17

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("website", "0179_alter_issue_label"),
("website", "0180_rename_project_visit_count_repo_repo_visit_count"),
]

operations = []
1 change: 1 addition & 0 deletions website/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ class Issue(models.Model):
(5, "Typo"),
(6, "Design"),
(7, "Server Down"),
(8, "Trademark Squatting"),
)
user = models.ForeignKey(User, null=True, blank=True, on_delete=models.CASCADE)
team_members = models.ManyToManyField(User, related_name="reportmembers", blank=True)
Expand Down
1 change: 1 addition & 0 deletions website/templates/report.html
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ <h3 class="text-xl font-bold leading-none text-red-500">Latest Issues</h3>
<option value="5">Typo</option>
<option value="6">Design</option>
<option value="7">Server down</option>
<option value="8">Trademark Squatting</option>
</select>
</div>
</div>
Expand Down
Loading