Skip to content

Submission for Midterm Project #68

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
Open
CCallahanIV wants to merge 221 commits into
base: submission
Choose a base branch
from
Open

Submission for Midterm Project #68

CCallahanIV wants to merge 221 commits into from

Conversation

@CCallahanIV
Copy link
Collaborator

@CCallahanIV CCallahanIV commented Jan 17, 2017

No description provided.

CCallahanIV and others added 30 commits December 21, 2016 19:50
@CCallahanIV
Updated README for project description.
1695441
@CCallahanIV
Update README.md
0d4db3e
@CCallahanIV
Added user stories.
afe8489
@rveeblefetzer
Update README.md
ebc2ced
@CCallahanIV
Initial commit, scaffold created.
3848ac1
@CCallahanIV
Initial Commit of roughed out structure.
e35da75 
Added routes.py, security.py, .css files, jinja2 templates, and updated views and setup.py
@ellezv
changed manage route for username specific, added login, logout and r…
fd35e27 
…egister views
@rveeblefetzer
add auth policies, credential check, CSRF protection
343de25
@ellezv
added csrf token field
6ca11e5
@rveeblefetzer
Merge branch 'views' of https://github.com/PyListener/CF401-Project-1…
88ac0e5 
…---PyListener into home_template
@ellezv
Merge branch 'security' of https://github.com/PyListener/CF401-Projec…
d660d0f 
…t-1---PyListener into manage_template
@ellezv
template for manage page
1e1e947
@rveeblefetzer
basic main template
57c7538
@ellezv
Merge branch 'home_template' of https://github.com/PyListener/CF401-P…
c7b6b3f 
…roject-1---PyListener into manage_template
@CCallahanIV
Wrote structure of model and updated components of other files to imp…
2a2a9ed 
…ort correct model objects.
@ellezv
merge models
bb567ad
@CCallahanIV
uncommented Categories in import statement.
66666a4
@CCallahanIV
Merge pull request #26 from PyListener/manage_template
e7ab6cd 
End of Day merge to development. Preparing for pulls for evening's work.
@CCallahanIV
Updated .gitignore with *.sqlite
e859ed7
@CCallahanIV
Merge pull request #27 from PyListener/models
f887e92 
Updated .gitignore with *.sqlite
@ellezv
manage template modified to fit models
92e6fff
@rveeblefetzer
added psycopg2 to requires
cedf056
@CCallahanIV
Wrote basic set of categories and attributes.
7365645
@rveeblefetzer
added environment variable for database
8be261b
@rveeblefetzer
added environ variable to initdb
4e96ed8
@CCallahanIV
Merge pull request #28 from PyListener/init_db
4de7b51 
Init db
@CCallahanIV
Merge pull request #1 from rveeblefetzer/patch-1
76c0cd3 
Update README.md
@ellezv
manage view with file upload for new contact
6bd3fc6
@CCallahanIV
Added sample data set and began writing code to load that data into t…
8bdf16b 
…he db.
@ellezv
Merge pull request #30 from PyListener/home_tests
12d1417 
Home tests
CCallahanIV and others added 30 commits January 31, 2017 15:50
@CCallahanIV
Merge branch 'newpics' of https://github.com/PyListener/CF401-Project…
d93fb18 
…-1---PyListener into dev-test
@CCallahanIV
Fixed errors in data.json.
d796fe9
@CCallahanIV
Merge pull request #79 from PyListener/dev-test
7df5d7f 
Dev test
@CCallahanIV
Merge pull request #80 from PyListener/development
760300b 
Development
@CCallahanIV
added lines to production.ini for https compatibilitiy.
ecab3ad
@CCallahanIV
troubleshooting production.ini
96970e8
@CCallahanIV
Added 'pylistener:' to static route.
4cb2ad3
@CCallahanIV
working over https
c890212
@CCallahanIV
troubleshooting AddressError from yagmail, suspect python 2/3 incompa…
7ac7824 
…tibility. imported unicode literals.
@CCallahanIV
updated requirements.
dacf54c
@CCallahanIV
please god work
8962105
@CCallahanIV
please god work
0ed57c7
@CCallahanIV
Because this always happens.
d736569
@ellezv
replaced textbelt with twilio
1c381e5
@ellezv
Merge branch 'master' of https://github.com/PyListener/CF401-Project-…
83cb10d 
…1---PyListener into textbelt-hotfix
@CCallahanIV
Merge pull request #81 from PyListener/textbelt-hotfix
bbb003c 
Textbelt hotfix
@ellezv
deleted unused readme.txt
154693e
@ellezv
blank line at end of file
e43b153
@ellezv
breaking down and renaming functions
3a03e5e
@ellezv
refactored display view, now broken down in helper functions
6c4a00f
@ellezv
code cleanup, linetoolong errors
f999553
@ellezv
minor fixes in setup.py and test_db change in tests.py
74a4105
@ellezv
non-passing tests fixed. Need more tests.
fe4da89
@ellezv
test cleanup
39b1521
@ellezv
updated readme.
a7c0a29
@ellezv
Merge pull request #82 from PyListener/views_refactoring
6ba373f 
Views refactoring
@ellezv
Merge pull request #84 from PyListener/tests_fix
d2ba54f 
Tests fix
@ellezv
readme typos fix
fe3033d
@ellezv
readme edit
ec293dc
@ellezv
Merge pull request #83 from PyListener/readme
1c31d0b 
Readme
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

in progress

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@CCallahanIV @rveeblefetzer @ellezv