Derek Stegelman committed revision
923da1708f
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
179b8fdc53
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
52d330d2b0
updated readme link location
Garrett Pennington committed revision
4d851d690d
home page relative links
Derek Stegelman committed revision
b59d31988b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
f44563d3ad
Remove inline styles.
Derek Stegelman committed revision
e9067799ed
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
765c1f38cb
search box text color
Garrett Pennington committed revision
66e04525c6
home page type
Garrett Pennington committed revision
2cb41ac74c
sort all explanations by score
Garrett Pennington committed revision
6eaa25626e
broke vote score updater
Garrett Pennington committed revision
c23cd98e74
readme site location
Garrett Pennington committed revision
c74aa30cf5
readme update
Garrett Pennington committed revision
6ce53f5f28
removed humans.txt ref
Garrett Pennington committed revision
212a15734e
red label if nsfw
Garrett Pennington committed revision
2d9e99d9ab
render tags in explanation list too
Garrett Pennington committed revision
cc03fbfbf2
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
d714ce4d26
todo in parsers
Garrett Pennington committed revision
3a4dd7159e
parse title by meta name
Garrett Pennington committed revision
2ff63df1dd
added parsers.py
Jon Faustman committed revision
37a394958a
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
bb3d8abc3d
Tag checkbox style change.
Garrett Pennington committed revision
a2044dacdb
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
5887640c7e
NSFW tag checkboxes.
Garrett Pennington committed revision
754f7c3a9e
added checoze link in footer
Garrett Pennington committed revision
c5172bd9f2
moar homepage links
Garrett Pennington committed revision
e7d4b1c69b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
19ac35c305
explanation form uses checkboxes
Jon Faustman committed revision
8e3151e63b
Add css min.
Jon Faustman committed revision
b63d981785
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
486b102155
iOS-Orientationchange-Fix.
Derek Stegelman committed revision
e1d8f8f957
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
8f8a9b7c3e
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
cedbf10a2f
Uncomment GA.
Garrett Pennington committed revision
b4f032d7c7
readme update
Derek Stegelman committed revision
ce21a72d68
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
a383ab0de2
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
1d18104029
Select 100%.
Garrett Pennington committed revision
e959464f1a
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
0ad3314e0a
readme update
Derek Stegelman committed revision
0efcc77723
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
deb8675076
Hide username on mobile.
Derek Stegelman committed revision
d98e9500fd
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
98196db3ee
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
59ea90eee4
merge conflicts
Derek Stegelman committed revision
d547150701
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
61430f1859
fix for error on prompt page.
Garrett Pennington committed revision
7874e5292f
docstrings
Garrett Pennington committed revision
1c82728fa7
home page examples
Jon Faustman committed revision
95c12e84e9
Add alert-error for entry.
Derek Stegelman committed revision
3533d2029e
adding errors in for other forms.
Derek Stegelman committed revision
2b3bfece08
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
f2dc037187
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
7fe9373796
Add alert-error for login.
Derek Stegelman committed revision
b1c7ec6c6e
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
0e8ee8d063
Merge conflicts.
Jon Faustman committed revision
2d26d4bed6
Remove extra div, class to well headdings.
Derek Stegelman committed revision
8ce68e5292
add form.errors
Garrett Pennington committed revision
b7ea1f60c2
docstrings
Derek Stegelman committed revision
b2367b71b5
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
302a47745a
docstrings
Jon Faustman committed revision
369e9f1893
.btn-large in entry prompt for consistency.
Garrett Pennington committed revision
f4abd38e15
docstrings
Garrett Pennington committed revision
de2c23027b
docstrings
Derek Stegelman committed revision
62def35a72
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
241ad6167e
Polishing changes.
Jon Faustman committed revision
597c24e631
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
0b69370ef1
Header/footer color change.
Derek Stegelman committed revision
e765c097cc
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
0a1882ff08
Remove inline styles, add even class for entry page.
Derek Stegelman committed revision
24f565e9e4
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
df5d683712
Reordering styles.
Jon Faustman committed revision
69b961725f
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
8391aea0fc
Add back Bootstrap spans.
Derek Stegelman committed revision
57628a1e99
add API help
Derek Stegelman committed revision
3f1545ee79
Help doc update
Derek Stegelman committed revision
7c9ac4bc50
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
c072630027
search results shows url, if it has one
Derek Stegelman committed revision
6f58624f5f
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
0d211ef461
Search checks the term against entry name AND url
Jon Faustman committed revision
70ba3b0d68
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
a30d1194df
Style changes.
Derek Stegelman committed revision
122bfa7cf5
Travis calm down.
Derek Stegelman committed revision
dcf17faf35
new coverage
Derek Stegelman committed revision
ecc8ddd027
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
34d2d1fb8d
Merge pull request #12 from checoze/feature/model_refactor
Feature/model refactor
Derek Stegelman committed revision
c0f67b0663
Test add more time.
Derek Stegelman committed revision
bc1cc1410c
Add help link back in.
Derek Stegelman committed revision
fdf345a6f5
covearge.
Derek Stegelman committed revision
6e5ab192d7
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
718afd7a55
New coverage.
Jon Faustman committed revision
dbfbe96c7f
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
f88672982b
Change up styles.
Derek Stegelman committed revision
4923fc0f88
add time to tests.
Derek Stegelman committed revision
1ec41dcfdb
entry model uses is_url util method
Garrett Pennington committed revision
1ec41dcfdb
entry model uses is_url util method
Derek Stegelman committed revision
0cd188141b
broke class name
Derek Stegelman committed revision
ba000a78f0
Tags are only an option if the term looks like an link
Garrett Pennington committed revision
ba000a78f0
Tags are only an option if the term looks like an link
Derek Stegelman committed revision
4cef8f9752
utils.py
Garrett Pennington committed revision
4cef8f9752
utils.py
Derek Stegelman committed revision
b9a3de65e6
adding failed test back in
Derek Stegelman committed revision
79aee7561c
stubbed out model method for identifying links
Garrett Pennington committed revision
79aee7561c
stubbed out model method for identifying links
Derek Stegelman committed revision
41896db31f
travis debug
Garrett Pennington committed revision
209aa919d2
added tags to prompt page
Derek Stegelman committed revision
209aa919d2
added tags to prompt page
Derek Stegelman committed revision
87fd67378f
debug travis.
Derek Stegelman committed revision
596c55e742
Merge branch 'develop' into feature/model_refactor
Garrett Pennington committed revision
596c55e742
Merge branch 'develop' into feature/model_refactor
Derek Stegelman committed revision
27de1bac4f
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
c8b259a96e
Travis fix?
Derek Stegelman committed revision
d20755af4b
moved tags to explanation
Garrett Pennington committed revision
d20755af4b
moved tags to explanation
Jon Faustman committed revision
5827791ea2
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
a76bc214d4
Stripping styles.
Derek Stegelman committed revision
b36d35d2f9
Removing unused libs
Derek Stegelman committed revision
babfd9d394
new coverage.
Derek Stegelman committed revision
d3f5a827ab
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
06cc41a87d
new tests.
Derek Stegelman committed revision
dea4af9c75
Login page fix.
Garrett Pennington committed revision
8ac9113d49
Merge pull request #11 from checoze/feature/templates
Feature/templates
Garrett Pennington committed revision
d88e97cc90
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
6892b99b1e
render url tags in detail page
Jon Faustman committed revision
544eb5eca1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
5f0434f50e
Container for alles.
Derek Stegelman committed revision
117fb70327
Remove debug statement. fix tests.
Derek Stegelman committed revision
0476d778d3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
fa403da371
quick change to login template
Derek Stegelman committed revision
29293bc68e
new tests
Garrett Pennington committed revision
1df626bd95
show tags on detail page
Jon Faustman committed revision
1a8980c925
Number dyslexic.
Derek Stegelman committed revision
21cdec331e
adding login page.
Derek Stegelman committed revision
a769af233b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
4d7aaccdf2
upgoat text lower caps
Garrett Pennington committed revision
7bb399688f
added container in prompt too
Garrett Pennington committed revision
2063fef60d
todo fo show
Garrett Pennington committed revision
e8b27b7c8f
get most popular model method
Garrett Pennington committed revision
55c687d5ee
entry detail styles
Garrett Pennington committed revision
8ff7dc260e
crappy container to center content...jon will likely fix later
Garrett Pennington committed revision
602e193e49
home page template edits
Garrett Pennington committed revision
602e193e49
home page template edits
Jon Faustman committed revision
d76b70205a
Merge conflict.
Jon Faustman committed revision
efb849c708
Entry page markup.
Garrett Pennington committed revision
243839d97e
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
93bc30283f
can only vote once
Derek Stegelman committed revision
c8092c5787
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
c5692858ff
Add stub for potential API documentation.
Derek Stegelman committed revision
deb7f15aed
Adding some doc strings. Cleanup debug stuff.
Garrett Pennington committed revision
ceb5e5f3a4
ajax voting updates score
Jon Faustman committed revision
18e4be9970
Generic error pages.
Derek Stegelman committed revision
9f6ea4a81d
Space
Derek Stegelman committed revision
cf9ee10325
Remove Comment API
Jon Faustman committed revision
1e58cff357
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
5f650f47a2
Remove some Bootstrap components.
Derek Stegelman committed revision
d6e3116a74
help docs update
Derek Stegelman committed revision
3381398df8
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
f273ddfb38
Page titles.
Garrett Pennington committed revision
fc3c786e41
front page text
Garrett Pennington committed revision
fc3c786e41
front page text
Jon Faustman committed revision
790d41e565
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
87ea943efa
Title block change.
Garrett Pennington committed revision
a6ecda13d2
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
499200c65c
quotes around term in template
Derek Stegelman committed revision
a7af4d4e1b
add help link.
Derek Stegelman committed revision
929ada7729
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
c4d6500f8f
Some footer text.
Jon Faustman committed revision
9cbc268366
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
72dd2a9f72
Remove old js file, unused static dir.
Derek Stegelman committed revision
0508d15e75
a few small fixes.
Derek Stegelman committed revision
f4b93c3f9b
Help updates.
Derek Stegelman committed revision
f29ec5a873
help docs
Derek Stegelman committed revision
8213f932c1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
b345e0aa68
Updating template for docs.
Garrett Pennington committed revision
0e83425a12
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
37f747c931
moved js to project level js
Derek Stegelman committed revision
cccd86ba6f
help docs
Derek Stegelman committed revision
4e86de258d
move help link. mounting help as static.
Derek Stegelman committed revision
454dfa1f6f
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
9ca52f234f
Small nav change.
Jon Faustman committed revision
687ede1ba6
Merge pull request #10 from checoze/feature/frontend
Signed in user nav.
Jon Faustman committed revision
be054a2b7d
Signed in user nav.
Jon Faustman committed revision
be054a2b7d
Signed in user nav.
Derek Stegelman committed revision
e50d9a6d99
Merge branches 'develop' and 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
e44f4fb3d2
moved js around
Garrett Pennington committed revision
439adc83d2
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
af1d2497fe
entry detail shows link
Derek Stegelman committed revision
1a04c3def3
Auto login user.
Derek Stegelman committed revision
b982422680
Fix tests.
Derek Stegelman committed revision
539a8a580d
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
4b9b0c7b08
Allow anonymous user.
Garrett Pennington committed revision
5f709951e8
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
c1ec26f4cc
remove Comments for now. we won't get that done
Derek Stegelman committed revision
563761eeb9
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
f774424caa
Merge pull request #9 from checoze/feature/addform
Feature/addform
Derek Stegelman committed revision
f774424caa
Merge pull request #9 from checoze/feature/addform
Feature/addform
Derek Stegelman committed revision
323ab04b79
Fixes.
Derek Stegelman committed revision
323ab04b79
Fixes.
Derek Stegelman committed revision
90d1cd3b5a
Remove type.
Derek Stegelman committed revision
90d1cd3b5a
Remove type.
Jon Faustman committed revision
90d1cd3b5a
Remove type.
Derek Stegelman committed revision
b794d3f35c
Merge branch 'develop' into feature/addform
Conflicts:
apps/explain/templates/explain/entry_prompt.html
apps/explain/views.py
Jon Faustman committed revision
b794d3f35c
Merge branch 'develop' into feature/addform
Conflicts:
apps/explain/templates/explain/entry_prompt.html
apps/explain/views.py
Derek Stegelman committed revision
b794d3f35c
Merge branch 'develop' into feature/addform
Conflicts:
apps/explain/templates/explain/entry_prompt.html
apps/explain/views.py
Derek Stegelman committed revision
da5171ff17
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
da5171ff17
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
da5171ff17
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
c61f032aa8
Debug
Derek Stegelman committed revision
c61f032aa8
Debug
Garrett Pennington committed revision
54e9bc9352
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
54e9bc9352
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
54e9bc9352
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
54e931be99
really crappy url title parser
Jon Faustman committed revision
54e931be99
really crappy url title parser
Garrett Pennington committed revision
54e931be99
really crappy url title parser
Derek Stegelman committed revision
e2e60cbb43
beautiful soup to requirements
Jon Faustman committed revision
e2e60cbb43
beautiful soup to requirements
Garrett Pennington committed revision
e2e60cbb43
beautiful soup to requirements
Jon Faustman committed revision
e71e51e57d
Merge pull request #7 from checoze/feature/frontend
Front-end design and styles.
Derek Stegelman committed revision
e71e51e57d
Merge pull request #7 from checoze/feature/frontend
Front-end design and styles.
Derek Stegelman committed revision
e71e51e57d
Merge pull request #7 from checoze/feature/frontend
Front-end design and styles.
Derek Stegelman committed revision
a51b7f5970
Bug fix.
Derek Stegelman committed revision
a51b7f5970
Bug fix.
Jon Faustman committed revision
a51b7f5970
Bug fix.
Derek Stegelman committed revision
c7a3ed12a4
More work on crate form
Jon Faustman committed revision
c7a3ed12a4
More work on crate form
Derek Stegelman committed revision
c7a3ed12a4
More work on crate form
Derek Stegelman committed revision
18f341e4cb
Entry create page.
Derek Stegelman committed revision
18f341e4cb
Entry create page.
Jon Faustman committed revision
18f341e4cb
Entry create page.
Derek Stegelman committed revision
8cbd7087f3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
8cbd7087f3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
8cbd7087f3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
bafdff12a7
start prasing URL entries
Jon Faustman committed revision
bafdff12a7
start prasing URL entries
Garrett Pennington committed revision
bafdff12a7
start prasing URL entries
Jon Faustman committed revision
2781c61515
Moving into one form.
Derek Stegelman committed revision
2781c61515
Moving into one form.
Derek Stegelman committed revision
2781c61515
Moving into one form.
Derek Stegelman committed revision
8540cdca12
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
8540cdca12
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
8540cdca12
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
850174c4b3
Merge pull request #8 from checoze/feature/search
search results page.
Derek Stegelman committed revision
850174c4b3
Merge pull request #8 from checoze/feature/search
search results page.
Derek Stegelman committed revision
5690eb3378
Merge branch 'develop' into feature/search
Jon Faustman committed revision
5690eb3378
Merge branch 'develop' into feature/search
Derek Stegelman committed revision
5690eb3378
Merge branch 'develop' into feature/search
Derek Stegelman committed revision
3b1956d88c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
3b1956d88c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
3b1956d88c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
b150449e4c
search results page.
Derek Stegelman committed revision
b150449e4c
search results page.
Derek Stegelman committed revision
b150449e4c
search results page.
Jon Faustman committed revision
a5505f98f1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
a5505f98f1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
a5505f98f1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
088d9256b5
tags initial data fixture
Jon Faustman committed revision
088d9256b5
tags initial data fixture
Garrett Pennington committed revision
088d9256b5
tags initial data fixture
Jon Faustman committed revision
05ecb601f3
choice tuple rename
Garrett Pennington committed revision
05ecb601f3
choice tuple rename
Derek Stegelman committed revision
05ecb601f3
choice tuple rename
Jon Faustman committed revision
455dfaa3f2
Sign up page.
Derek Stegelman committed revision
455dfaa3f2
Sign up page.
Derek Stegelman committed revision
455dfaa3f2
Sign up page.
Garrett Pennington committed revision
a457b754ac
tag model refactor
Jon Faustman committed revision
a457b754ac
tag model refactor
Derek Stegelman committed revision
a457b754ac
tag model refactor
Derek Stegelman committed revision
051069a2ce
search results page.
Jon Faustman committed revision
051069a2ce
search results page.
Derek Stegelman committed revision
051069a2ce
search results page.
Garrett Pennington committed revision
e4e47a95a8
added tag model
Derek Stegelman committed revision
e4e47a95a8
added tag model
Jon Faustman committed revision
e4e47a95a8
added tag model
Derek Stegelman committed revision
478af1256c
Add footer.
Derek Stegelman committed revision
478af1256c
Add footer.
Jon Faustman committed revision
478af1256c
Add footer.
Derek Stegelman committed revision
9c2e844c53
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
9c2e844c53
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
9c2e844c53
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
734a135840
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
734a135840
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
3250292f7f
Fix alert_type block.
Jon Faustman committed revision
3250292f7f
Fix alert_type block.
Jon Faustman committed revision
f0429652b1
merge develp, merge conflicts
Garrett Pennington committed revision
f0429652b1
merge develp, merge conflicts
Jon Faustman committed revision
e1170a8af7
comment markup
Garrett Pennington committed revision
e1170a8af7
comment markup
Derek Stegelman committed revision
5ad2387746
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
5ad2387746
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
9da2131da8
Merge pull request #5 from checoze/feature/frontend
Front-end design and styles.
Jon Faustman committed revision
9da2131da8
Merge pull request #5 from checoze/feature/frontend
Front-end design and styles.
Jon Faustman committed revision
814af32a90
Merge pull request #6 from checoze/feature/register
Feature/register
Derek Stegelman committed revision
814af32a90
Merge pull request #6 from checoze/feature/register
Feature/register
Jon Faustman committed revision
095315f13f
Messages.
Derek Stegelman committed revision
095315f13f
Messages.
Derek Stegelman committed revision
29dd95cfd1
Merge conflicts and add logout template.
Jon Faustman committed revision
29dd95cfd1
Merge conflicts and add logout template.
Derek Stegelman committed revision
29dd95cfd1
Merge conflicts and add logout template.
Derek Stegelman committed revision
e67f9cd126
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Derek Stegelman committed revision
e67f9cd126
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Jon Faustman committed revision
e67f9cd126
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Derek Stegelman committed revision
4365b98dc1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
4365b98dc1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
4365b98dc1
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
28183cfb8b
Adding scenario when you are signed in.
Jon Faustman committed revision
28183cfb8b
Adding scenario when you are signed in.
Derek Stegelman committed revision
28183cfb8b
Adding scenario when you are signed in.
Jon Faustman committed revision
e640041841
Home changes.
Derek Stegelman committed revision
e640041841
Home changes.
Derek Stegelman committed revision
c5404e790d
Allowing request context to pass to template.
Jon Faustman committed revision
c5404e790d
Allowing request context to pass to template.
Derek Stegelman committed revision
c5404e790d
Allowing request context to pass to template.
Garrett Pennington committed revision
2bb5bb9cc9
comments form
Jon Faustman committed revision
2bb5bb9cc9
comments form
Jon Faustman committed revision
9186cd97b8
added BASE_EXCLUDE_FIELDS to forms
Garrett Pennington committed revision
9186cd97b8
added BASE_EXCLUDE_FIELDS to forms
Jon Faustman committed revision
e90eb95ecb
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
e90eb95ecb
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
e90eb95ecb
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
a882aba89c
entry detail tempate upgrade
Derek Stegelman committed revision
a882aba89c
entry detail tempate upgrade
Jon Faustman committed revision
a882aba89c
entry detail tempate upgrade
Derek Stegelman committed revision
7d8c63f581
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Derek Stegelman committed revision
7d8c63f581
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Jon Faustman committed revision
7d8c63f581
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Jon Faustman committed revision
6833d50d40
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
6833d50d40
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
6833d50d40
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
0306ebb7d5
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Derek Stegelman committed revision
0306ebb7d5
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Derek Stegelman committed revision
0306ebb7d5
Merge branch 'develop' into feature/register
Conflicts:
apps/explain/views.py
Jon Faustman committed revision
de2198c7a3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
de2198c7a3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
de2198c7a3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
0d304a698c
ajax vote takes voting direction and creates vote object:
Garrett Pennington committed revision
0d304a698c
ajax vote takes voting direction and creates vote object:
Jon Faustman committed revision
0d304a698c
ajax vote takes voting direction and creates vote object:
Derek Stegelman committed revision
2322f5847a
Registration test.
Jon Faustman committed revision
2322f5847a
Registration test.
Derek Stegelman committed revision
2322f5847a
Registration test.
Jon Faustman committed revision
b7edfcf4d7
Template and forms update.
Derek Stegelman committed revision
b7edfcf4d7
Template and forms update.
Derek Stegelman committed revision
b7edfcf4d7
Template and forms update.
Jon Faustman committed revision
83ef1df230
Registration views/urls
Derek Stegelman committed revision
83ef1df230
Registration views/urls
Derek Stegelman committed revision
83ef1df230
Registration views/urls
Derek Stegelman committed revision
5dec032f17
Registration test
Derek Stegelman committed revision
5dec032f17
Registration test
Jon Faustman committed revision
5dec032f17
Registration test
Jon Faustman committed revision
c6f890f8ea
vote views update
Garrett Pennington committed revision
c6f890f8ea
vote views update
Derek Stegelman committed revision
c6f890f8ea
vote views update
Jon Faustman committed revision
831852f2b1
Home changes.
Derek Stegelman committed revision
831852f2b1
Home changes.
Garrett Pennington committed revision
6b3b0b14fb
mc pulled from develop
Jon Faustman committed revision
6b3b0b14fb
mc pulled from develop
Jon Faustman committed revision
2f1ee106fa
vote ajax sends object type and id
Garrett Pennington committed revision
2f1ee106fa
vote ajax sends object type and id
Jon Faustman committed revision
29055895ee
Add GA code.
Derek Stegelman committed revision
29055895ee
Add GA code.
Jon Faustman committed revision
e2a03b4478
voting urls
Garrett Pennington committed revision
e2a03b4478
voting urls
Jon Faustman committed revision
314624d3c6
added explain.js to base template
Garrett Pennington committed revision
314624d3c6
added explain.js to base template
Jon Faustman committed revision
69edd8d491
Fix for build
Derek Stegelman committed revision
69edd8d491
Fix for build
Derek Stegelman committed revision
3b15360737
Account registration.
Jon Faustman committed revision
3b15360737
Account registration.
Garrett Pennington committed revision
6d132654bd
voting ajax
Jon Faustman committed revision
6d132654bd
voting ajax
Jon Faustman committed revision
2ecce3e21b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
2ecce3e21b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
9b375569be
Update sot forms
Derek Stegelman committed revision
9b375569be
Update sot forms
Derek Stegelman committed revision
da9fd86203
Merge pull request #4 from checoze/feature/frontend
Feature/frontend
Jon Faustman committed revision
da9fd86203
Merge pull request #4 from checoze/feature/frontend
Feature/frontend
Jon Faustman committed revision
99a5fa0253
stopPropagation for dropdown-menu
Derek Stegelman committed revision
99a5fa0253
stopPropagation for dropdown-menu
Jon Faustman committed revision
14732b0a93
voting markup
Garrett Pennington committed revision
14732b0a93
voting markup
Derek Stegelman committed revision
2ab0ea829e
Add js file.
Jon Faustman committed revision
2ab0ea829e
Add js file.
Derek Stegelman committed revision
9404511233
Remoe handy.
Jon Faustman committed revision
9404511233
Remoe handy.
Jon Faustman committed revision
79022a631b
Merge branch 'develop' of github.com:checoze/like-im-5ive into feature/frontend
Derek Stegelman committed revision
79022a631b
Merge branch 'develop' of github.com:checoze/like-im-5ive into feature/frontend
Jon Faustman committed revision
5809888130
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
5809888130
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
1b06614fbd
Merge pull request #2 from checoze/feature/frontend
Front-end design and styles.
Jon Faustman committed revision
1b06614fbd
Merge pull request #2 from checoze/feature/frontend
Front-end design and styles.
Jon Faustman committed revision
113d996b8a
Adding some width.
Derek Stegelman committed revision
113d996b8a
Adding some width.
Derek Stegelman committed revision
9a4322dc1d
Merge branch 'develop' of github.com:checoze/like-im-5ive into feature/frontend
Jon Faustman committed revision
9a4322dc1d
Merge branch 'develop' of github.com:checoze/like-im-5ive into feature/frontend
Garrett Pennington committed revision
f1a017385c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
f1a017385c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
39059bc7ca
comments up/downvotes methods
Jon Faustman committed revision
39059bc7ca
comments up/downvotes methods
Garrett Pennington committed revision
039e51f163
downvotes method
Jon Faustman committed revision
039e51f163
downvotes method
Derek Stegelman committed revision
f3b6f95ed6
Changing home page.
Jon Faustman committed revision
f3b6f95ed6
Changing home page.
Garrett Pennington committed revision
e00611c034
explanation up votes method
Jon Faustman committed revision
e00611c034
explanation up votes method
Derek Stegelman committed revision
889f177dde
Mo coverage
Jon Faustman committed revision
889f177dde
Mo coverage
Derek Stegelman committed revision
d2568e84ec
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
d2568e84ec
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
12fca5e66c
update coverage.
Derek Stegelman committed revision
12fca5e66c
update coverage.
Derek Stegelman committed revision
cedb8c274e
Remove signin legend, dropdown-menu changes.
Jon Faustman committed revision
cedb8c274e
Remove signin legend, dropdown-menu changes.
Jon Faustman committed revision
58602560ef
imports fix
Garrett Pennington committed revision
58602560ef
imports fix
Jon Faustman committed revision
a813dbfaa8
moved manager to managers.py
Garrett Pennington committed revision
a813dbfaa8
moved manager to managers.py
Garrett Pennington committed revision
5886bff40d
Merge pull request #3 from checoze/feature/voting_models
Finish up models and managers for voting.
Jon Faustman committed revision
5886bff40d
Merge pull request #3 from checoze/feature/voting_models
Finish up models and managers for voting.
Derek Stegelman committed revision
6fc861a846
Fix.
Garrett Pennington committed revision
6fc861a846
Fix.
Jon Faustman committed revision
707b3ddab8
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
707b3ddab8
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
3da59a6a51
add explanation view
Garrett Pennington committed revision
3da59a6a51
add explanation view
Garrett Pennington committed revision
74bd50ae47
entry detail add explanation form
Jon Faustman committed revision
74bd50ae47
entry detail add explanation form
Jon Faustman committed revision
2e02546e79
signin-dropdown control-groups for errors
Derek Stegelman committed revision
2e02546e79
signin-dropdown control-groups for errors
Derek Stegelman committed revision
200208cb8a
update syntax
Garrett Pennington committed revision
200208cb8a
update syntax
Jon Faustman committed revision
200208cb8a
update syntax
Garrett Pennington committed revision
c0eb1aa34b
Finish up models and managers for voting.
Jon Faustman committed revision
c0eb1aa34b
Finish up models and managers for voting.
Derek Stegelman committed revision
c0eb1aa34b
Finish up models and managers for voting.
Jon Faustman committed revision
a641581cc4
Merge branch 'develop' of github.com:checoze/like-im-5ive into feature/frontend
Derek Stegelman committed revision
a641581cc4
Merge branch 'develop' of github.com:checoze/like-im-5ive into feature/frontend
Derek Stegelman committed revision
cad728ffed
Start sign in form
Jon Faustman committed revision
cad728ffed
Start sign in form
Jon Faustman committed revision
e917156e3b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
e917156e3b
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
af0e41d734
vote content type instances
Jon Faustman committed revision
af0e41d734
vote content type instances
Jon Faustman committed revision
ccbbd30d8c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
ccbbd30d8c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
febb536efa
vote model
Garrett Pennington committed revision
febb536efa
vote model
Garrett Pennington committed revision
34cc32dca9
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
34cc32dca9
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
3d51f8172f
most popular explanation method
Garrett Pennington committed revision
3d51f8172f
most popular explanation method
Derek Stegelman committed revision
16aed9574a
Test update
Jon Faustman committed revision
16aed9574a
Test update
Jon Faustman committed revision
13ed728412
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
13ed728412
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
5ac979b979
Mo tests
Derek Stegelman committed revision
5ac979b979
Mo tests
Jon Faustman committed revision
d09ba38349
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
d09ba38349
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
8cde44930a
explanation inline formset
Jon Faustman committed revision
8cde44930a
explanation inline formset
Jon Faustman committed revision
48cb012d91
Start of top nav.
Derek Stegelman committed revision
48cb012d91
Start of top nav.
Derek Stegelman committed revision
b9ed7e9872
Fix broken build.
Jon Faustman committed revision
b9ed7e9872
Fix broken build.
Jon Faustman committed revision
561c90af14
No longer need prod settings
Derek Stegelman committed revision
561c90af14
No longer need prod settings
Derek Stegelman committed revision
9a216c1085
static files update for Gondor
Jon Faustman committed revision
9a216c1085
static files update for Gondor
Derek Stegelman committed revision
7063256353
Start nav.
Jon Faustman committed revision
7063256353
Start nav.
Jon Faustman committed revision
223bab9dd8
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
223bab9dd8
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Jon Faustman committed revision
025c9867fe
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
7538b4d4e9
Fix for static URL
Jon Faustman committed revision
f7c1042430
initial spelling
Derek Stegelman committed revision
f73ee47890
New tests.
Derek Stegelman committed revision
6150cfbf80
Required gondor files.
Derek Stegelman committed revision
3ccb2f39c1
Adding Gondor as requirement.
Derek Stegelman committed revision
75d6fd0785
Allow help mounted for debugging.
Derek Stegelman committed revision
0c63cd1fae
First docs update.
Derek Stegelman committed revision
75e1cf9197
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
ea8745f03c
entry submission redirects to entry detail page
Garrett Pennington committed revision
452140a2a6
prompt page saves entry
Garrett Pennington committed revision
0226df8bf1
short readme update, probably jacked formatting
Garrett Pennington committed revision
5fbc2bed86
entry prompt form update
Garrett Pennington committed revision
6f9655ba0f
entry form on prompt page
Garrett Pennington committed revision
914660d06c
create entry prompt
Garrett Pennington committed revision
6bb04909e0
slugify name
Garrett Pennington committed revision
28acc9debb
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
ee5d95900d
entry detail view/page
Derek Stegelman committed revision
1863e2b4e4
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
801d01af52
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
d854c325e6
home search uses get_until_create
Garrett Pennington committed revision
3f0d229eb3
custom model manager
Derek Stegelman committed revision
d6d759f5fd
First coverage report
Derek Stegelman committed revision
de7c2082e6
Use local settings for tests.
Derek Stegelman committed revision
4f0ce5d158
Load tests
Derek Stegelman committed revision
f66fa6209f
Test case update
Derek Stegelman committed revision
868cfd414e
update ignore.
Derek Stegelman committed revision
acf5fc911b
add error templates.
Derek Stegelman committed revision
a92a3abdf6
Adding run test script.
Derek Stegelman committed revision
d0de3488aa
Adding coverage.
Derek Stegelman committed revision
f2421bdc1f
Travis build status
Derek Stegelman committed revision
00d6c8cdb3
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
3ab9cdc814
Test commit
Garrett Pennington committed revision
d7351edb05
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
4e099e083c
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Derek Stegelman committed revision
8e0861d846
Add travis, and first test case.
Garrett Pennington committed revision
539ca09700
abstract class
Garrett Pennington committed revision
9ee4664715
custom entry save method make random hex code
Derek Stegelman committed revision
86c2acbff3
Adding test case. adding test shell script.
Derek Stegelman committed revision
1f63f0e387
Docs update.
Derek Stegelman committed revision
6d14972e5f
Comment API
Derek Stegelman committed revision
0d4d1a9d09
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Conflicts:
urls.py
Derek Stegelman committed revision
59e5a8afbf
Entry API
Derek Stegelman committed revision
7ed906d8ad
Adding API stubb
Garrett Pennington committed revision
39e96683a2
render basic homepage
Derek Stegelman committed revision
19e9836264
Merge branch 'develop' of github.com:checoze/like-im-5ive into develop
Garrett Pennington committed revision
bc0f7a9b12
installed apps
Garrett Pennington committed revision
12a09a1b5d
define some profile fields
Garrett Pennington committed revision
b2978f8f01
define explain fields
Garrett Pennington committed revision
e1d68120ea
merge conflicts
Garrett Pennington committed revision
f18fee5414
profile app
Garrett Pennington committed revision
de25167037
explain admin
Garrett Pennington committed revision
622d6f04ab
Comment and Exlanation models
Garrett Pennington committed revision
9dcf0ca704
Base model
Jon Faustman committed revision
81cc9bcc09
Add Twitter Bootstrap.
Garrett Pennington committed revision
1fdc20a3ca
model stubbing
Garrett Pennington committed revision
21c036c23b
ignore update
Jon Faustman committed revision
19bc694fb8
Add Compass project.
Jon Faustman committed revision
4fe2d9260b
Add some JS libs.
Jon Faustman committed revision
38bbad52da
Base template changes.
Jon Faustman committed revision
477de00273
gitignore update
Derek Stegelman committed revision
3e6d564852
Fixes.
Derek Stegelman committed revision
5e8ee82e43
Settings updates.
Derek Stegelman committed revision
1d1748e06a
Update fab to use hadrian.
Derek Stegelman committed revision
3c6ecee2d5
import class based views.
Derek Stegelman committed revision
a13ddc9167
Use single urls.py
Derek Stegelman committed revision
ef2de8d910
ignore for pycharm
Derek Stegelman committed revision
84894bd8f2
Requirements update
Derek Stegelman committed revision
426f46bd1b
Updating tests. Remove urls module, adding just a single py
Garrett Pennington committed revision
58a17c7cc1
explain static and templates setup
Garrett Pennington committed revision
20d92ee77e
test bp
Garrett Pennington committed revision
88a8e4f881
explain app boilerplate
Garrett Pennington committed revision
52d4d02b91
app setup
Garrett Pennington committed revision
22baede3d2
conf setup
Garrett Pennington committed revision
8055be358a
urls setup
Garrett Pennington committed revision
7b20944084
settings start
Garrett Pennington committed revision
d95e6da96f
build structure
Jon Faustman jonfaustman
Derek Stegelman dstegelman
Garrett Pennington gpennington