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.

Sign up for GitHub

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

Jump to bottom

getting lastest changes #91

Open
wants to merge 100 commits into
base: Jessica
Choose a base branch
from
Open

getting lastest changes #91

wants to merge 100 commits into from

Conversation

foxstrunk
Copy link
Collaborator

No description provided.

akohli96 and others added 30 commits April 7, 2017 23:04
@akohli96
Merge pull request #73 from SIU-CS/master
df806d4 
Merging latest
@akohli96
Started bot page
9233920
@akohli96
Changed constant name so pylint is happy
2c1511b
@akohli96
Displaying posted data on same page
473d8a5
@akohli96
Display on page refresh (GET request)
b8720aa
@akohli96
Adding link for help
4edf94a
@akohli96
Merge pull request #77 from SIU-CS/master
2902a8b 
Merging in Mark and James latest
@akohli96
Added model for Messaging with bot
bf90326
@akohli96
Print is_user as well
c79197d
@akohli96
Fixed integrety error with date time
7e3aacb
@akohli96
Focusing on getting chat done for time being
907f58c
@akohli96
Added better start doc
6eb1312
@akohli96
Messages getting saved to db
7dbb9cf
@akohli96
Displaying all the messages on GET request
4fb4501
@akohli96
All messages displayed on POST as well
91936f1
@akohli96
Merge pull request #80 from SIU-CS/master
cf09cb8 
Adding in latest changes from Mark for my branch
@akohli96
python manage.py loaddata fixtures/quotes.json
6577ea5
@akohli96
Merge branch 'sprint3-ayush' of https://github.com/SIU-CS/J-JAM-produ…
9a46b54 
…ction into sprint3-ayush
@akohli96
removing semi colon cause python
f4e320d
@akohli96
Adding new line because pylint
b55a63a
@akohli96
Different file to encapsulate bot message processing
7601a08
@akohli96
Fixed bug with refering Quote object
8f028ff
@akohli96
Throwing up Usage method and using returns instead of print in bot_he…
caf0cfb 
…lper
@akohli96
Encapsulated everythign in a class with static method
87fd62a
@akohli96
OOPfied bot logic
b66437e
@akohli96 @perpetual-pelican
python manage.py loaddata fixtures/quotes.json
56cf777
@perpetual-pelican
Added logic for notification after 24 hours without a new post
f697f7e
@akohli96
Bot processing message on chat page
893a65a
@akohli96
If request fails return first quote saved in database
b991089
@akohli96
So help response does not fail
bae88bc
markiragoldberg and others added 30 commits May 4, 2017 16:14
@markiragoldberg
new script
1e4f11b
@markiragoldberg
again
ab6efda
@markiragoldberg
suspect the data was corrupted
1ba2f9f
@markiragoldberg
having trouble encrypting the keys
a08c0ec
@markiragoldberg
Merge branch 'master' into sprint3-mark
0cbcd90
@markiragoldberg
added some tests
1f91e06
@markiragoldberg
test mhap
46abb84
@markiragoldberg
oops!
c6aabff
@markiragoldberg
test names
6f97822
@markiragoldberg
add name to settings page
3458f40
@markiragoldberg
fix tests
88f8090
@akohli96
Merge pull request #97 from SIU-CS/sprint3-mark
e89510d 
Add Travis Continuous Integration Integration
@perpetual-pelican
Added tests and made login required for password change page
1ffa31e
@perpetual-pelican
Took out fetch_quote test and added test for default process_message …
daa34d9 
…response
@markiragoldberg
Merge pull request #98 from SIU-CS/sprint3-james-test
2881103 
Added tests and made login required for password change page
@akohli96
Added travis status
611e021
@markiragoldberg
Update README.md
cdff30f
@akohli96
informing user to add api keys to .bashrc
4639799
@akohli96
Adding full instructions
99882d8
@akohli96
Delete olddb
0f5908c
@akohli96
Delete db.sqlite3_beforeSENT
3ec227f
@akohli96
Delete db.sqlite3_backup2_after_james
7417b4f
@akohli96
Delete db.sqlite3_backup
ba3f756
@markiragoldberg
Fix variable name
2eaaf5c
@markiragoldberg
Fix travis env
eced44d
Merge pull request #100 from SIU-CS/sprint3-mark
e072ced 
Fix variable name for secret key
@akohli96
Fixing requirements and changing SECRET_KEY to SECRET
74d3de3
@perpetual-pelican
Fixed url so root redirects to index (mhap homepage)
991d30d
@perpetual-pelican
Merge branch 'master' of https://github.com/SIU-CS/J-JAM-production i…
d616021 
…nto sprint3-james-test
@akohli96
Merge pull request #101 from SIU-CS/sprint3-james-test
7a67a38 
Sprint3 james test - fix urls so root redirects to index
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@foxstrunk @akohli96 @perpetual-pelican @markiragoldberg