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

Release 1.0 #120

Merged
merged 195 commits into from
May 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
195 commits
Select commit Hold shift + click to select a range
4e810c9
css changes
Apr 16, 2018
d91b224
css additions
Apr 16, 2018
7c20048
css for adv page
Apr 16, 2018
4ae4202
css updates adv page
Apr 16, 2018
9562ba5
css changes adv search page
Apr 16, 2018
fcdba9c
css adv page
Apr 16, 2018
353ef8a
adv css
Apr 16, 2018
7822336
css adv page
Apr 16, 2018
90859e5
css adv page
Apr 16, 2018
95af8eb
left align css
Apr 16, 2018
ac631a3
css updates
Apr 16, 2018
4a128a9
contact css
Apr 16, 2018
351f18d
contact css
Apr 16, 2018
e7187b1
new search layout
Apr 17, 2018
06dcbdb
new search template
Apr 17, 2018
b463f51
search template
Apr 17, 2018
6c88d53
shrinking the logo
Apr 17, 2018
01bd014
update adv page
Apr 17, 2018
44bd70d
make checkboxes bigger
Apr 17, 2018
32e4159
update ugly text boxes
Apr 17, 2018
de54b7f
checkboxes updates
Apr 17, 2018
1244706
checkbox updates
Apr 17, 2018
9d986ba
change login button
Apr 17, 2018
0476a77
update enter button
Apr 17, 2018
13e556f
Instagram API
DarkHeromagic Apr 17, 2018
eeb4b18
Instagram API Example output txt
DarkHeromagic Apr 17, 2018
97da65d
Adding twitter fields
phileepae Apr 17, 2018
dca7415
changing results header
Apr 17, 2018
0b67441
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Apr 17, 2018
958afdb
attempt to highlight search term
Apr 18, 2018
1fd9514
undo attempt
Apr 18, 2018
173af56
search design
Apr 18, 2018
b73c3fb
Update views.py
phileepae Apr 18, 2018
8149476
Adding twitter fields
phileepae Apr 19, 2018
d31b918
minor change
phileepae Apr 19, 2018
f01b11e
cleaning up some code
phileepae Apr 19, 2018
c25a8cc
Adding more Twitter fields to spreadsheet
phileepae Apr 19, 2018
dc27ee4
search button on Adv page
Apr 19, 2018
cdf1a0f
Added twitter fields and data to spreadsheet
phileepae Apr 19, 2018
e60c063
new search button
Apr 19, 2018
c935fc9
failed attempt to fix bold font
Apr 19, 2018
832d4cf
max field lengths
Apr 19, 2018
a65572c
fix bold font
Apr 19, 2018
01adfdb
Layout Changes
Nekomian44 Apr 19, 2018
fab0f08
Updated Results Formatting
Nekomian44 Apr 19, 2018
42bbdf4
failed attempt highlight
Apr 19, 2018
b753239
Fixing text box sizes for custom subreddit, twitter location, twitter…
phileepae Apr 20, 2018
8973f54
adding movie
Apr 23, 2018
ff0f8db
Highlight button now changes the word searched for
phileepae Apr 24, 2018
56a4e8b
Update about.html
DarkHeromagic Apr 24, 2018
00a6ef7
Update about.html
DarkHeromagic Apr 24, 2018
1a8fc1f
Update about.html
DarkHeromagic Apr 24, 2018
52e4e0d
Update about.html
DarkHeromagic Apr 25, 2018
abbd2e2
Update about.html
DarkHeromagic Apr 25, 2018
5d106dc
Update about.html
DarkHeromagic Apr 25, 2018
1dd006e
Update about.html
DarkHeromagic Apr 25, 2018
d05c9eb
Update about.html
DarkHeromagic Apr 25, 2018
1beb018
Update about.html
DarkHeromagic Apr 25, 2018
147eab0
Update about.html
DarkHeromagic Apr 25, 2018
6c5de8f
Update about.html
DarkHeromagic Apr 25, 2018
cf88edc
Update about.html
DarkHeromagic Apr 25, 2018
709f952
Update about.html
DarkHeromagic Apr 25, 2018
d8959f9
adding script for highlight
phileepae Apr 25, 2018
2a56cec
login redirect
Apr 25, 2018
c770ad0
Update results.html
phileepae Apr 25, 2018
62e3e44
Altered search results
phileepae Apr 25, 2018
e354469
highlight
Apr 25, 2018
94a8166
Update results.html
phileepae Apr 25, 2018
4a30d2f
added comments
phileepae Apr 25, 2018
1834d4c
highlight color change
Apr 25, 2018
c362fd0
Advanced Search bug fixes.
Sorrento110 Apr 25, 2018
73ef347
Added more twitter spreadsheet fields
phileepae Apr 25, 2018
f82fc8d
commented out testing print line
phileepae Apr 25, 2018
8154a20
Twitter now returns a multitude of results. Reddit improvements.
Sorrento110 Apr 25, 2018
67b9c2b
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Sorrento110 Apr 25, 2018
17d4c32
Create test.txt
phileepae Apr 26, 2018
8963545
Adding documentation file
phileepae Apr 26, 2018
0451b2d
Delete test.txt
phileepae Apr 26, 2018
795d831
Adding twitter fields and data to export
phileepae Apr 26, 2018
e2521cd
Updated RedditAPI Documentation
Nekomian44 Apr 27, 2018
41feb83
Updated Details about Myself + Formatting
Nekomian44 Apr 27, 2018
08f2cb5
Cleaned up Code Comments
Nekomian44 Apr 27, 2018
ef60064
Error Checks
Nekomian44 Apr 27, 2018
3280a95
Removing Unnecessary Code and Padding
Nekomian44 Apr 27, 2018
a69063d
adding more twitter export fields
phileepae Apr 28, 2018
420ee55
adding more twitter export fields
phileepae Apr 28, 2018
f63409a
Uploading WordCloud JS Files and Updating TwitterAPI
Nekomian44 Apr 29, 2018
b3dcc4f
Reorganization
phileepae Apr 29, 2018
b5b2e30
Twitter export fields complete
phileepae Apr 29, 2018
f7decea
fixing order of headers
phileepae Apr 29, 2018
22561d1
reordering twitter headers
phileepae Apr 29, 2018
3536436
left out a comma
phileepae Apr 29, 2018
7f47336
API search fixes, specifically advanced search fixes. Comments added.
Sorrento110 Apr 29, 2018
56f89ab
Twitter Unit test added.
Sorrento110 Apr 29, 2018
5e92594
Bugfix on twitterAPI with next_url.
Sorrento110 Apr 29, 2018
9519e99
Bugfix for x NOT x crashing program.
Sorrento110 Apr 29, 2018
20c37d3
Location filtering enabled.
Sorrento110 Apr 30, 2018
a51a08f
Radius Box added to twitter advanced search.
Sorrento110 Apr 30, 2018
9b05287
styled radius field
Apr 30, 2018
cacfd43
form.py
DarkHeromagic Apr 30, 2018
7f9bcf0
Update views.py
DarkHeromagic Apr 30, 2018
1474666
Update forms.py
DarkHeromagic Apr 30, 2018
8d170ee
Update views.py
DarkHeromagic Apr 30, 2018
9d81818
Update views.py
DarkHeromagic Apr 30, 2018
db3f736
Update views.py
DarkHeromagic Apr 30, 2018
45b4b6a
Update views.py
DarkHeromagic Apr 30, 2018
18e8507
Update views.py
DarkHeromagic Apr 30, 2018
b88ec28
Update views.py
DarkHeromagic Apr 30, 2018
18e6234
Update views.py
DarkHeromagic Apr 30, 2018
061d8df
Update views.py
DarkHeromagic Apr 30, 2018
115cfc4
Update views.py
DarkHeromagic Apr 30, 2018
d35419a
Update views.py
DarkHeromagic Apr 30, 2018
5d3ef7d
Update views.py
DarkHeromagic Apr 30, 2018
a3ab2d8
Update urls.py
DarkHeromagic Apr 30, 2018
d2b97f2
Add files via upload
DarkHeromagic Apr 30, 2018
2273a44
Update views.py
DarkHeromagic Apr 30, 2018
ab70679
Update change_password.html
DarkHeromagic Apr 30, 2018
9302eca
Update change_password.html
DarkHeromagic Apr 30, 2018
0bafd3a
Update index.html
DarkHeromagic Apr 30, 2018
76c8453
Update about.html
DarkHeromagic Apr 30, 2018
35c424b
Update about.html
DarkHeromagic Apr 30, 2018
10e0878
Sentiment Analysis / Chart Updates / WordCloud Updates
Nekomian44 Apr 30, 2018
06a5e14
Update views.py
DarkHeromagic Apr 30, 2018
95a6c83
Update views.py
DarkHeromagic Apr 30, 2018
dfabd5c
Update views.py
DarkHeromagic Apr 30, 2018
62e1107
Update regist.html
DarkHeromagic Apr 30, 2018
54fa99d
Update regist.html
DarkHeromagic Apr 30, 2018
f8ee645
Update regist.html
DarkHeromagic Apr 30, 2018
e1a14fd
Update regist.html
DarkHeromagic Apr 30, 2018
18ebb4d
Update regist.html
DarkHeromagic Apr 30, 2018
542554f
Update regist.html
DarkHeromagic Apr 30, 2018
84597c1
Finalized Twitter Sentiment Analysis
Nekomian44 Apr 30, 2018
33dd81a
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Nekomian44 Apr 30, 2018
6350f00
Update regist.html
DarkHeromagic Apr 30, 2018
8b41d29
Update regist.html
DarkHeromagic Apr 30, 2018
8a4fd5c
Update index.html
DarkHeromagic Apr 30, 2018
fda644d
Update main.9c8442cc79bc.css
DarkHeromagic Apr 30, 2018
f1841b5
Update main.9c8442cc79bc.css
DarkHeromagic Apr 30, 2018
15799a7
Update main.9c8442cc79bc.css
DarkHeromagic Apr 30, 2018
39ec0ae
Update main.9c8442cc79bc.css
DarkHeromagic Apr 30, 2018
54306ac
Update views.py
DarkHeromagic Apr 30, 2018
723ecf0
Update views.py
DarkHeromagic Apr 30, 2018
076a6df
Update views.py
DarkHeromagic Apr 30, 2018
00ce749
Added instructions for adding more api with links
phileepae Apr 30, 2018
b97dc47
Fixed bug in twitter API where geosearch would try to trigger every t…
Sorrento110 Apr 30, 2018
bb0b32c
Revert "Fixed bug in twitter API where geosearch would try to trigger…
Apr 30, 2018
65ace8c
Minor Fixes + Word Cloud Initializations
Nekomian44 Apr 30, 2018
0c17b7b
styled registration page
Apr 30, 2018
d0c8f6f
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Apr 30, 2018
56f6f0b
Updating Registration Form
Nekomian44 Apr 30, 2018
1d1fc97
Adding info about myself
phileepae Apr 30, 2018
029494a
update change password css
Apr 30, 2018
24679c3
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Apr 30, 2018
02d1aaf
Update about.html
phileepae Apr 30, 2018
8e90cb5
Slight JSON Changes
Nekomian44 Apr 30, 2018
e21f3d3
Working WordCloud
Nekomian44 Apr 30, 2018
5aa0acf
Update urls.py
DarkHeromagic May 1, 2018
7206a0c
Update urls.py
DarkHeromagic May 1, 2018
b4f8516
Update urls.py
DarkHeromagic May 1, 2018
f08e099
TwitterAPI bugfix.
Sorrento110 May 1, 2018
b1e832c
Twitter Bugfix.
Sorrento110 May 1, 2018
dd769cd
Finalized WordCloud
Nekomian44 May 1, 2018
4897fae
Update urls.py
DarkHeromagic May 1, 2018
a16a583
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Nekomian44 May 1, 2018
5e0af6b
Merge branch 'heroku-dev' of https://github.com/SCCapstone/Social-Mon…
Nekomian44 May 1, 2018
e9792e6
Add files via upload
DarkHeromagic May 1, 2018
27a4df7
Update password_reset_form.html
DarkHeromagic May 1, 2018
7d811a8
Add files via upload
DarkHeromagic May 1, 2018
fc9afcc
Add files via upload
DarkHeromagic May 1, 2018
47f4622
Update password_reset_form.html
DarkHeromagic May 1, 2018
8869142
Update password_reset_done.html
DarkHeromagic May 1, 2018
aa0cd2c
Add files via upload
DarkHeromagic May 1, 2018
2ca759b
Update password_reset_confirm.html
DarkHeromagic May 1, 2018
9e3f633
Add files via upload
DarkHeromagic May 1, 2018
350ffd8
Update password_reset_complete.html
DarkHeromagic May 1, 2018
18b4bd3
Update urls.py
DarkHeromagic May 1, 2018
c4ae6db
Update urls.py
DarkHeromagic May 1, 2018
a9f2175
Update views.py
DarkHeromagic May 1, 2018
cb22fd0
Update views.py
DarkHeromagic May 1, 2018
6d41429
Update views.py
DarkHeromagic May 1, 2018
29334c3
Update urls.py
DarkHeromagic May 1, 2018
490ba5f
Update urls.py
DarkHeromagic May 1, 2018
08056de
Update views.py
DarkHeromagic May 1, 2018
eafbd8d
Update views.py
DarkHeromagic May 1, 2018
99b3d08
Update urls.py
DarkHeromagic May 1, 2018
e299caf
Update views.py
DarkHeromagic May 1, 2018
5a30ec6
Update views.py
DarkHeromagic May 1, 2018
d144230
Update views.py
DarkHeromagic May 1, 2018
bd11f22
Update urls.py
DarkHeromagic May 1, 2018
78a93f3
Update views.py
DarkHeromagic May 1, 2018
0661e3b
Updating Script Dependencies
Nekomian44 May 1, 2018
980fbc5
Update about.html
DarkHeromagic May 1, 2018
1372069
Update about.html
DarkHeromagic May 1, 2018
b2fc49b
Finalized Advanced Search Updates
Nekomian44 May 1, 2018
7b48991
Merge branch 'master' into heroku-dev
Nekomian44 May 1, 2018
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
Binary file not shown.
188 changes: 146 additions & 42 deletions assets/css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions assets/scripts/d3-cloud-master/bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "d3-cloud",
"version": "1.2.4",
"main": "build/d3.layout.cloud.js",
"dependencies": {
"d3-dispatch": "1"
},
"ignore": [
".DS_Store",
".git",
".gitignore",
".npmignore",
"examples",
"index.js",
"node_modules",
"package.json"
]
}
Loading