Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
a5339c8
Merge pull request #253 from ror-community/dev
lizkrznarich Jul 15, 2022
81dfffb
Merge pull request #260 from ror-community/dev
lizkrznarich Jul 28, 2022
bd040a0
Merge pull request #261 from ror-community/staging
lizkrznarich Jul 28, 2022
368cb63
Merge pull request #264 from ror-community/dev
lizkrznarich Aug 25, 2022
865ae0a
Merge pull request #269 from ror-community/staging
lizkrznarich Oct 24, 2022
d5341ec
Merge pull request #274 from ror-community/dev
lizkrznarich Nov 16, 2022
4ee9b9c
Merge pull request #275 from ror-community/staging
lizkrznarich Nov 28, 2022
89986f9
Merge pull request #277 from ror-community/dev
lizkrznarich Nov 28, 2022
ded0616
Merge pull request #278 from ror-community/staging
lizkrznarich Nov 28, 2022
e3b7e8e
Merge pull request #280 from ror-community/dev
lizkrznarich Dec 5, 2022
e08edba
Merge pull request #281 from ror-community/staging
lizkrznarich Dec 6, 2022
0b5646e
Update README.md
lizkrznarich Dec 13, 2022
a1b4356
Merge pull request #284 from ror-community/dev
lizkrznarich Jan 4, 2023
d14086f
Merge pull request #285 from ror-community/staging
lizkrznarich Jan 4, 2023
a4ad953
Merge pull request #287 from ror-community/dev
lizkrznarich Jan 6, 2023
de66acd
Merge pull request #288 from ror-community/staging
lizkrznarich Jan 6, 2023
c14d920
Merge pull request #290 from ror-community/dev
lizkrznarich Jan 8, 2023
5dafd67
Merge pull request #291 from ror-community/staging
lizkrznarich Jan 8, 2023
709f7a2
Merge pull request #293 from ror-community/dev
lizkrznarich Feb 2, 2023
b3e38c9
Merge pull request #294 from ror-community/staging
lizkrznarich Feb 2, 2023
89b53ad
Merge pull request #296 from ror-community/dev
lizkrznarich Mar 16, 2023
4eff4cf
Merge pull request #297 from ror-community/staging
lizkrznarich Mar 16, 2023
b376e78
Merge pull request #302 from ror-community/dev
lizkrznarich Apr 5, 2023
8bc6d59
Merge pull request #303 from ror-community/staging
lizkrznarich Apr 5, 2023
fd76ffc
Merge pull request #325 from ror-community/dev
lizkrznarich Apr 20, 2023
482dbec
Merge pull request #327 from ror-community/dev
lizkrznarich Apr 20, 2023
9e847c2
Merge pull request #330 from ror-community/staging
lizkrznarich Apr 24, 2023
b100045
Merge pull request #334 from ror-community/dev
lizkrznarich Apr 25, 2023
ae60e9d
Merge pull request #335 from ror-community/staging
lizkrznarich Apr 26, 2023
3c827bb
Merge pull request #337 from ror-community/dev
lizkrznarich Apr 27, 2023
4d93bd1
Merge pull request #338 from ror-community/staging
lizkrznarich Apr 27, 2023
3f7f746
Merge pull request #342 from ror-community/dev
lizkrznarich Jun 7, 2023
5b90953
Merge pull request #344 from ror-community/dev
lizkrznarich Jun 7, 2023
fb049a9
Merge pull request #345 from ror-community/staging
lizkrznarich Jun 8, 2023
cd7af29
Merge pull request #350 from ror-community/dev
lizkrznarich Jul 11, 2023
9096172
Merge pull request #352 from ror-community/staging
lizkrznarich Jul 11, 2023
9b5adf5
Merge pull request #353 from ror-community/dev
lizkrznarich Jul 11, 2023
6eb6451
Merge pull request #354 from ror-community/staging
lizkrznarich Jul 11, 2023
2f96f55
Merge pull request #360 from ror-community/dev
lizkrznarich Nov 6, 2023
0296054
Merge pull request #362 from ror-community/dev
lizkrznarich Nov 6, 2023
cc4f778
Merge pull request #364 from ror-community/dev
lizkrznarich Nov 7, 2023
59cb296
Merge pull request #365 from ror-community/staging
lizkrznarich Nov 8, 2023
224e36e
Merge pull request #369 from ror-community/dev
lizkrznarich Feb 26, 2024
db2a6d0
Merge pull request #370 from ror-community/staging
lizkrznarich Mar 9, 2024
8d14fc8
Merge pull request #385 from ror-community/dev
lizkrznarich Apr 1, 2024
fb9c2a1
Merge pull request #386 from ror-community/staging
lizkrznarich Apr 1, 2024
a5756fd
Merge pull request #388 from ror-community/dev
lizkrznarich Apr 8, 2024
943060b
Merge pull request #389 from ror-community/staging
lizkrznarich Apr 8, 2024
3f9f87a
Merge pull request #391 from ror-community/dev
lizkrznarich Apr 15, 2024
cd6ac78
Merge pull request #394 from ror-community/dev
lizkrznarich Apr 18, 2024
94bad80
Merge pull request #395 from ror-community/staging
lizkrznarich Apr 18, 2024
83859c2
Merge pull request #400 from ror-community/dev
lizkrznarich Jul 29, 2024
034592b
Merge pull request #401 from ror-community/staging
lizkrznarich Jul 29, 2024
73b15ca
Merge pull request #403 from ror-community/persist-es-vol
lizkrznarich Sep 18, 2024
82c7bcc
Revert "Persist ES volume"
lizkrznarich Sep 18, 2024
8a5a5ae
Merge pull request #404 from ror-community/revert-403-persist-es-vol
lizkrznarich Sep 18, 2024
065c8b9
Update README.md
lizkrznarich Nov 20, 2024
6554d74
Merge pull request #409 from ror-community/lizkrznarich-patch-1
lizkrznarich Nov 20, 2024
162de35
Merge pull request #415 from ror-community/dev
lizkrznarich Dec 12, 2024
7c205f6
Merge pull request #417 from ror-community/staging
lizkrznarich Dec 12, 2024
9740cd6
Merge pull request #419 from ror-community/dev
lizkrznarich Dec 16, 2024
cad370a
Merge pull request #420 from ror-community/staging
lizkrznarich Dec 16, 2024
eed0eb7
client id changes
ashwinisukale Mar 10, 2025
89a7eeb
remove duplicate import
kaysiz Mar 10, 2025
16c6ff8
Add method to generate 32 character client_id
kaysiz Mar 10, 2025
cf5205c
Add mysql db for local dev
kaysiz Mar 11, 2025
9a7033b
Add mysql library
kaysiz Mar 11, 2025
f22d8cb
Add db connection settings
kaysiz Mar 11, 2025
d217532
move model to models.py to fix circular ddependency issue
kaysiz Mar 11, 2025
9c20eec
move serializer to serializers.py to fix circular dependnecy
kaysiz Mar 11, 2025
95d6579
refactor and update imports
kaysiz Mar 11, 2025
3ca2ff3
Add migrations for client table
kaysiz Mar 11, 2025
f5cce3e
rename views file and make folder a package
kaysiz Mar 11, 2025
76f9675
Send email and added more validation
ashwinisukale Mar 20, 2025
65461ab
Some refactoring in api structure
ashwinisukale Mar 24, 2025
0d7de83
Moved the urls to common urls and now it is working
ashwinisukale Mar 25, 2025
e4fbc2b
add migration for update of the of the email attribute on client
kaysiz Mar 26, 2025
d3d44ea
Rate limit part will be done next release
ashwinisukale Mar 27, 2025
9f8e524
moved the variables to env file
ashwinisukale Mar 27, 2025
927d54e
Addressed code review comments
ashwinisukale Apr 15, 2025
d84483d
Merge branch 'dev' into client_id_ror
ashwinisukale Apr 15, 2025
724df3a
Allow null values
ashwinisukale Apr 15, 2025
7b83b60
clean up the requirements.tx file
kaysiz Apr 16, 2025
6362e6b
Merge branch 'dev' into client_id_ror
kaysiz Apr 16, 2025
be7e234
Add config for github workflow
kaysiz Apr 16, 2025
953ad9b
Add config for github workflow
kaysiz Apr 16, 2025
324963d
add config for db for staging github workflow
kaysiz Apr 16, 2025
7a3d6d2
add config for db for release github workflow
kaysiz Apr 16, 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
14 changes: 14 additions & 0 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ jobs:
ELASTIC7_HOST: "localhost"
ELASTIC7_PORT: "9200"
ELASTIC_PASSWORD: "changeme"
DB_NAME: rorapi
DB_USER: ror_user
DB_HOST: db
DB_PASSWORD: password
DB_PORT: 3306
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.AWS_REGION }}
Expand All @@ -30,6 +35,15 @@ jobs:
http.cors.allow-origin: "*"
ports:
- 9200:9200
db:
image: mysql:8.0
env:
DB_NAME: rorapi
DB_USER: ror_user
DB_HOST: rorapi
DB_PASSWORD: password
ports:
- 3306:3306
steps:
- name: Checkout ror-api code
uses: actions/checkout@v2
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ jobs:
ELASTIC_PASSWORD: "changeme"
ELASTIC7_HOST: "localhost"
ELASTIC7_PORT: "9200"
DB_NAME: rorapi
DB_USER: ror_user
DB_HOST: db
DB_PASSWORD: password
DB_PORT: 3306
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.AWS_REGION }}
Expand All @@ -26,6 +31,15 @@ jobs:
http.cors.allow-origin: "*"
ports:
- 9200:9200
db:
image: mysql:8.0
env:
DB_NAME: rorapi
DB_USER: ror_user
DB_HOST: rorapi
DB_PASSWORD: password
ports:
- 3306:3306
steps:
- name: Checkout ror-api code
uses: actions/checkout@v2
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ jobs:
ELASTIC_PASSWORD: "changeme"
ELASTIC7_HOST: "localhost"
ELASTIC7_PORT: "9200"
DB_NAME: rorapi
DB_USER: ror_user
DB_HOST: db
DB_PASSWORD: password
DB_PORT: 3306
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.AWS_REGION }}
Expand All @@ -27,6 +32,15 @@ jobs:
http.cors.allow-origin: "*"
ports:
- 9200:9200
db:
image: mysql:8.0
env:
DB_NAME: rorapi
DB_USER: ror_user
DB_HOST: rorapi
DB_PASSWORD: password
ports:
- 3306:3306
steps:
- name: Checkout ror-api code
uses: actions/checkout@v2
Expand Down
69 changes: 16 additions & 53 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,67 +1,30 @@
attrs==24.3.0
base32-crockford==0.3.0
boto3==1.35.99
botocore==1.35.99
certifi==2019.11.28
chardet==3.0.4
coreapi==2.3.3
coreschema==0.0.4
dbus-python==1.2.16
Django==2.2.28
django-cors-headers==3.1.0
django-prometheus==1.0.15
djangorestframework==3.11.2
elasticsearch==7.10.1
elasticsearch-dsl==7.4.1
expiringdict==1.2.2
fuzzywuzzy==0.17.0
elasticsearch_dsl==7.4.1
geonamescache==1.3.0
idna==2.8
importlib_resources==6.4.5
iso639-lang==2.5.1
itypes==1.2.0
Jinja2==3.1.5
jmespath==1.0.1
jsonschema==3.2.0
launchdarkly-server-sdk==7.6.1
MarkupSafe==2.1.5
mock==3.0.5
mysqlclient==2.2.7
numpy==1.22.0
pandas==1.4.1
patsy==1.0.1
platformdirs==4.3.6
prometheus_client==0.21.1
PyGObject==3.36.0
pyRFC3339==2.0.1
pyrsistent==0.20.0
python-apt==2.0.1+ubuntu0.20.4.1
python-dateutil==2.9.0.post0
python-dotenv==0.10.3
python-Levenshtein==0.12.1
python-magic==0.4.27
pytz==2024.2
requests==2.22.0
requests-aws4auth==0.9
requests-unixsocket==0.2.0
s3transfer==0.10.4
scipy==1.10.1
semver==2.13.0
mock==3.0.5
base32_crockford==0.3.0
elasticsearch==7.10.1
djangorestframework==3.11.2
coreapi==2.3.3
django-prometheus==1.0.15
sentry-sdk==0.12.2
six==1.14.0
sqlparse==0.5.3
python-dotenv==0.10.3
django-cors-headers==3.1.0
unidecode==1.1.1
fuzzywuzzy==0.17.0
python-Levenshtein==0.12.1
statsmodels==0.10.2
boto3
pandas==1.4.1
numpy==1.22
titlecase==2.3
tomli==2.2.1
Unidecode==1.1.1
uritemplate==4.1.1
urllib3==1.25.8
yapf==0.43.0
zipp==3.20.2
update_address @ git+https://github.com/ror-community/update_address.git
launchdarkly-server-sdk==7.6.1
jsonschema==3.2.0
python-magic
iso639-lang
mysqlclient==2.2.7
bleach==6.0.0
pycountry==22.3.5