Skip to content

Commit

Permalink
Merge branch 'feature/history' into 'develop'
Browse files Browse the repository at this point in the history
Feature/history

See merge request PBSA/PeerplaysIO/bos/CouchPotato/python-cp-gui!17
  • Loading branch information
jemshid committed May 18, 2021
2 parents 6f1efe2 + 8d77593 commit e3dbf99
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 100 deletions.
2 changes: 2 additions & 0 deletions couchpotato/feed.py
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,8 @@ def MatchingEvents(self, leagueIds):
eventsFromFeed = eventsFromFeed + self.Past15(leagueId)
eventsFromChain = self.cp.EventsAllSortedForApi()
matchingEvents = []
if isinstance(eventsFromChain, type(None)):
return matchingEvents
for k in range(len(eventsFromChain)):
# eventFromChain = eventsFromChain.iloc[k]
eventFromChain = eventsFromChain[k]
Expand Down
2 changes: 1 addition & 1 deletion couchpotato/home/templates/create_cp.html
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,12 @@ <h3> Start Time</h3>
function(data, status){
if (data.success == 'Posted'){
alert(data.message)
window.location.href = '/'
}

// console.log(data.message)
// console.log(data.message.id)

// window.location.href = '/'
});
}

Expand Down
116 changes: 17 additions & 99 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,101 +1,19 @@
bookiesports
bos-mint
bos-incidents
django-sslserver

aiohttp==3.7.4
appdirs==1.4.4
asgiref==3.3.1
async-timeout==3.0.1
asyncinit==0.2.4
attrs==20.3.0
backcall==0.2.0
base58==2.0.1
blinker==1.4
bos-sync==0.3.0
certifi==2020.12.5
chardet==3.0.4
click-datetime==0.2
click==7.1.2
colorlog==4.6.2
coreapi==2.3.3
coreschema==0.0.4
dateutils==0.6.12
decorator==4.4.2
django-rest-swagger==2.2.0
django-rest-swagger==2.2.0
Django==3.1.6
djangorestframework==3.12.2
dnspython==2.0.0
drf-yasg==1.20.0
drf-yasg==1.20.0
ecdsa==0.13.3
email-validator==1.1.2
Events==0.4
expiringdict==1.2.1
Flask-Assets==2.0
Flask-Mail==0.9.1
Flask-Markdown==0.3
Flask-Script==2.0.6
Flask-SQLAlchemy==2.4.4
Flask-WTF==0.14.3
Flask==1.1.2
future==0.18.2
graphenelib==1.0.1
idna==2.8
importlib-metadata==3.3.0
ipython
ipython-genutils==0.2.0
itsdangerous==1.1.0
jedi==0.17.2
Jinja2==2.11.3
requests==2.22.0
bookied_sync==0.0.3
bos_incidents==0.4.1
bos_mint==0.5.4
click==8.0.0
colorlog==5.0.1
Django==3.2.3
djangorestframework==3.12.4
drf_yasg==1.20.0
jsonschema==3.2.0
Markdown==3.3.3
MarkupSafe==1.1.1
multidict==5.1.0
mysqlclient
numpy==1.19.4
openapi-codec==1.3.2
pandas
parso==0.7.1
numpy==1.20.3
pandas==1.2.4
peerplays==0.3.0
pexpect==4.8.0
pickleshare==0.7.5
prettytable==2.0.0
prompt-toolkit==3.0.8
ptyprocess==0.6.0
pyasn1==0.4.8
pycparser==2.20
pycryptodome==3.9.9
Pygments==2.7.4
pylibscrypt==1.8.0
pymongo==3.11.2
pyparsing==2.4.7
pyrsistent==0.17.3
python-dateutil==2.8.1
pytz==2020.4
PyYAML==5.4
requests==2.22.0
ruamel.yaml==0.16.12
scrypt==0.8.17
simplejson==3.17.2
six==1.15.0
SQLAlchemy==1.3.20
sqlparse==0.4.1
strict-rfc3339==0.7
telegram
tqdm==4.54.1
traitlets
treelib==1.6.1
typing-extensions==3.7.4.3
uritemplate
urllib3==1.24.3
uWSGI
wcwidth==0.2.5
webassets==2.0
websocket-client==0.56.0
websockets==8.1
Werkzeug==1.0.1
WTForms==2.3.3
yarl==1.6.3
zipp==3.4.0
python_dateutil==2.8.1
pytz==2021.1
PyYAML==5.4.1
strict_rfc3339==0.7
telegram==0.0.1
django-sslserver

0 comments on commit e3dbf99

Please sign in to comment.