Development - #31

Open

balintsimon wants to merge 383 commits into

CodecoolBase:masterfrom

balintsimon:development

This pull request is big! We're only showing the most recent 250 commits

Commits on Nov 14, 2019

Add upload image
balintsimon
committed
745662f
extends /upload-file route with function
Rhyvan
committed
d80ba8e
Add delete picture upon deletion of question
balintsimon
committed
2b82da3
add presentation link to readme
kiglarka
authored
2342c74
update gitignore
kiglarka
committed
72f7fb2
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
7e32e31
add answer now loads from child template
Rhyvan
committed
3194bc0
upload files in anwers
Rhyvan
committed
f002107
Delete picture upload upon posting new question (remains at edit question)
balintsimon
committed
bce438c
Add question/answer css style
Tajti Bendegúz
committed
110936e
merge conflict fixed
Tajti Bendegúz
committed
fa4f342
Add form.css tweak
Tajti Bendegúz
committed
f6e8a60
Corrects error at answer posting (now image addition does not work)
balintsimon
committed
fff930b
Delete picture addition upon adding new question
balintsimon
committed
ee51278

Commits on Nov 15, 2019

Add 2 new questions
balintsimon
committed
87b4ca8
fix bug that redirected early if no image selected when writing answer
Rhyvan
committed
cd0ed2f
add function descriptions to data_manager.py
Rhyvan
committed
4a28206

Commits on Nov 25, 2019

add sql sample data

lterray
authored and
Rhyvan
committed
4c38366
initialize SQL database
Rhyvan
committed
149b150
Refactor and add write new question to database
balintsimon
committed
9137e9a
Add write answer to file (untested)
balintsimon
committed
f085751
manage_question with SQL
Tajti Bendegúz
committed
e826a72
Add working add answer
balintsimon
committed
8e6b5ee

Commits on Nov 26, 2019

edit question using SQL
Tajti Bendegúz
committed
7b2307a
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Tajti Bendegúz
committed
0af8412
answer table fixed
Tajti Bendegúz
committed
5e4668e
Add vote on question
balintsimon
committed
2412c8d
Add vote on answer
balintsimon
committed
d4c9e84
Delete old function to modify votes
balintsimon
committed
bcd9915
Add view counter
balintsimon
committed
fa350c4
Refactor unused code related to CSV
balintsimon
committed
2ea73cd
Add delete answer to question
balintsimon
committed
be1b825
Delete question, related answer and comments
balintsimon
committed
b5a7036
Refactor unused code
balintsimon
committed
a3e270c
Correct error at headers
balintsimon
committed
2db684a
Add edit and delete answer
balintsimon
committed
800e7dd
handle view number exceptions
kiglarka
committed
f89ec74
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
7f355f8
Format timestamp
balintsimon
committed
198b938
add comments to questions, answers (backend)
Rhyvan
committed
b22dfb3
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
438df9d
Corrects add answer
balintsimon
committed
60c64a0
Deleted modify view counter
balintsimon
committed
61836fc
merge
Rhyvan
committed
f172784
merge3
Rhyvan
committed
58bafbd
add comment functions
Rhyvan
committed
2cbba39
Add search
Tajti Bendegúz
committed
5432019
remove + sign
kiglarka
committed
eafb4d8
merge conflict solved
Tajti Bendegúz
committed
eeab237
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Tajti Bendegúz
committed
4dff5f7
index.css fixed
Tajti Bendegúz
committed
ab50c66
Clicking on the logo brings back to the home page
Tajti Bendegúz
committed
5613790
home page and search bar are now more user friendly
Tajti Bendegúz
committed
46ec955
restyle Edit/Delete/Comment Answers links
kiglarka
committed
b7e8f3c
Refactor old functions
balintsimon
committed
3225f68
Add picture mechanics
balintsimon
committed
bac5804
Add show picture on main page
balintsimon
committed
e8d7625
Add image capabilities to /static/images folder
balintsimon
committed
bdf4a2d

Commits on Nov 27, 2019

replace python sort decorator with SQL sorting
Rhyvan
committed
52f47a5
Add picture upload and modify
balintsimon
committed
dd2b1ba
Merge branch 'master' of github.com:balintsimon/ask-mate-python
balintsimon
committed
dec338b
add index page
Rhyvan
committed
50e592b
add edit and delete comment
kiglarka
committed
e29cc0d
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
13e2129
change route to edit answer
kiglarka
committed
e9a4584
add html for displaying question comments
Rhyvan
committed
3f13287
comment implement(not working)
Tajti Bendegúz
committed
ec6af63
merge conflict solved
Tajti Bendegúz
committed
45831f8
fix view counter
kiglarka
committed
40c89b9
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
29ad82c
refactor
kiglarka
committed
2d80f84
display comments on html
Rhyvan
committed
472670d
modified data
Tajti Bendegúz
committed
ce0e5b2
add delete comments function
Rhyvan
committed
eceb600
main page messages sliced
Tajti Bendegúz
committed
b800fc2
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Tajti Bendegúz
committed
aa62250
add list page filter to show message
balintsimon
committed
a41a134
recycle bin image as delete
Rhyvan
committed
2b99960
add confirmation before delete
Rhyvan
committed
e6337bf
Change commit submission time upon edition
balintsimon
committed
c8d3eed
Add sort answers on questions page by vote and submission time
balintsimon
committed
28ab269
Add get commit function
balintsimon
committed
a4d6005
Corrects get comment data
balintsimon
committed
fb25c89
add edit comment functions
Rhyvan
committed
2fce565
add edit comment functions
Rhyvan
committed
b52b04c
comment display sorted by id
Rhyvan
committed
4183deb
add manage-question.css
kiglarka
committed
46780a5
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
2a81fbd
Refactor: delete util.py and dependencies
balintsimon
committed
431ec6a
Refactor vote on answer
balintsimon
committed
1809c6f
Refactor delete answer to original spec
balintsimon
committed
aa434f1
Refactor code
balintsimon
committed
ed52180
change nav links in question
kiglarka
committed
ab49e6b
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
7bf517c
Add search results in answers
balintsimon
committed
d70995b
Merge branch 'master' of github.com:balintsimon/ask-mate-python
balintsimon
committed
ba9c387
add current version of question css
kiglarka
committed
1506b5f
update question css
kiglarka
committed
c3f524d
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
kiglarka
committed
85be863

Commits on Nov 28, 2019

search button design
Tajti Bendegúz
committed
59e844f
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Tajti Bendegúz
committed
f42dfaf
Add zoom picture on cover
balintsimon
committed
9f5eeb9
Merge branch 'master' of github.com:balintsimon/ask-mate-python
balintsimon
committed
e1b3edc
Correct image hover
balintsimon
committed
0f5f950
Corrects edit count display of comment
balintsimon
committed
5bba0aa
add border bottom to title
Tajti Bendegúz
committed
7626f75
refactored question.html and design layout
Rhyvan
committed
09e7db7
Add style to add and edit comment page
balintsimon
committed
4b415f6
Merge branch 'webdesign'
Rhyvan
committed
2990308
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Rhyvan
committed
2ee58a7
fix css
Rhyvan
committed
b609ba9
Rewrite zoom picture and edit time
balintsimon
committed
87a6305
Add several line display in message body
balintsimon
committed
d2adcae
Add header to add or modify comment page
balintsimon
committed
7447401
Adds white background to question image on view question
balintsimon
committed
ba710d5
refine css
Rhyvan
committed
378b175
Reverse changes
balintsimon
committed
6a81c69
Corrects none input in comment edit time on dispaly
balintsimon
committed
3b9ae9a
Delete image hover
balintsimon
committed
505842f
add photos to static
kiglarka
committed
75c50b7
fix answer vote
kiglarka
committed
0534a0b
Fix answer vote route
balintsimon
committed
71a1caa
Merge branch 'master' of github.com:balintsimon/ask-mate-python
balintsimon
committed
f2c9b9c
Reverse last update
balintsimon
committed
384f780
Fix sort: now sorts whole list
balintsimon
committed
8ce0f7c
set body max-width and centered
Rhyvan
committed
4925362

Commits on Nov 29, 2019

Adds Rudi's modifications
balintsimon
committed
1a6f2ea

Commits on Dec 9, 2019

add user table
Tajti Bendegúz
committed
a08c976
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Tajti Bendegúz
committed
b568e19
add branches
Tajti Bendegúz
committed
82b3c56
add password hash
Tajti Bendegúz
committed
5bebcd5
add create user function
kiglarka
committed
5c6b833
fix user table attributes in .sql file
Rhyvan
committed
b041148
Merge branch 'master' of https://github.com/balintsimon/ask-mate-python
Rhyvan
committed
b5e0cfb
Merge branch 'master' into register
Tajti Bendegúz
committed
ab16959
add user database update
Tajti Bendegúz
committed
c60e350
modify data table attributes, constraints to enable q&a&comment user binding
Rhyvan
committed
193145b
login halfway
Tajti Bendegúz
committed
5238043
Solve merge conflict
balintsimon
committed
8c45851
Add login-register with css style
Tajti Bendegúz
committed
97e8038
solve merge conflict
Tajti Bendegúz
committed
4b22bf0
login-register finished
Tajti Bendegúz
committed
8c2878e

Commits on Dec 10, 2019

not working
Tajti Bendegúz
committed
9a52666
Initial commit for new SQL
balintsimon
committed
2573e61
Resolve merge conflict
balintsimon
committed
1929f5c
insert username variables to html files
Rhyvan
committed
b146385
Resolve merge conflict
balintsimon
committed
c8c6fc7
sorting works desc
Tajti Bendegúz
committed
6c19c2d
Fix already existing user re-registration error
balintsimon
committed
1133def
Add logout
balintsimon
committed
32f842e
Merge remote-tracking branch 'origin/development' into web
Rhyvan
committed
12ab173
modify reference names in html to insert database values
Rhyvan
committed
f7d1854
Corrects SQL request
balintsimon
committed
3b8d88c
Delete typos and outdated references
balintsimon
committed
2eb7ab6
finish sorting branch
Tajti Bendegúz
committed
8bb988d

Commits on Dec 11, 2019

start sql to list users
kiglarka
committed
0be509c
add all questions button
Tajti Bendegúz
committed
2e435ef
add JS to display authorized buttons only
Rhyvan
committed
19c83e0
Merge branch 'development' into web
Rhyvan
committed
b4ff8ce
hotfix finished
Tajti Bendegúz
committed
e6353ae
Initial commit for user vote SQL table
balintsimon
committed
ad0b15b
add list user page
kiglarka
committed
fb8ca57
fix username display in comments for question
Rhyvan
committed
2d63a4e
resolve merge conflicts on database branch
kiglarka
committed
d3ee224
merge conflict solved
Tajti Bendegúz
committed
4dbb308
fuck my merge conflict
Tajti Bendegúz
committed
2679cac
resolve merge confilct
kiglarka
committed
a60e9be
update on list users
kiglarka
committed
a6b030a
add new column to question table: accepted_answer
Rhyvan
committed
5615e59
Add basic SQL
balintsimon
committed
1ee3d88
add accept button, visible by question author
Rhyvan
committed
e4fca16
Add vote functionality without visual cue
balintsimon
committed
43c0716
new accepted answer is written to database
Rhyvan
committed
f99494d
hide ACCEPT button at accepted answer
Rhyvan
committed
ea40a57
Merge development to feature/vote
balintsimon
committed
49e0ff9
SQL order by accepterd_answer
Rhyvan
committed
cac2ad2
Dual vote mechanism
balintsimon
committed
09fc2b9
fix display that visitors can't see any buttons which requires login
Rhyvan
committed
931a552
add css style to accepted answer
Rhyvan
committed
6833829
add list user
kiglarka
committed
a90954a
Merge branch 'database' into development
kiglarka
committed
ea2d128
fix SQL sorting by accepted answer
Rhyvan
committed
42201d0
fix list all user and resolve route to user page
kiglarka
committed
e50233d
fix list users and add route to user page
kiglarka
committed
2a333ee
add blank template to user page
kiglarka
committed
3a8cdde
add function so questions can be voted up, down or reset vote by same user
balintsimon
committed
3312ef8
add view of user questions
kiglarka
committed
929638c
Merge pull request #1 from balintsimon/web
Rhyvan
authored
044e20d
merged reputation(accept button) to development
Rhyvan
committed
10be6af
fix answer block that shifted, and few indentation
Rhyvan
committed
e7aa60e
add new question form
Tajti Bendegúz
committed
6a73bf5
add full feature vote on questions and answers
balintsimon
committed
6344fe7
finish question form
Tajti Bendegúz
committed
783c113
fix route, deleting question now loads main page
Rhyvan
committed
59ea071
fix bug in '/list' route, causing SQL crash
Rhyvan
committed
a08e754
add gaining reputation via question feature
Rhyvan
committed
e908696
fix user page
kiglarka
committed
c41190f
Merge branch 'database' into development
kiglarka
committed
9a02350
resolve merge conflicts
balintsimon
committed
11158f3
Merge branch 'development' of github.com:balintsimon/ask-mate-python into feature/vote
balintsimon
committed
8b3d227
merge feature_repu
balintsimon
committed
036c616
fix missing answer[username] in SQL getting answer
Rhyvan
committed
e0f149f
unknown modifications
balintsimon
committed
a4b9659
merge development into feature_repu
Rhyvan
committed
665a598
correct typo
balintsimon
committed
ba3bc33
add calc reputation to vote up/down on question and answer
balintsimon
committed
6c41d32

Commits on Dec 12, 2019

add calc reputation functionality to vote on answer
balintsimon
committed
fed14eb
reputation is shown next to username
Rhyvan
committed
b122950
fix delete accepted answer
balintsimon
committed
f01b774
Merge branch 'feature/vote' of github.com:balintsimon/ask-mate-python into development
balintsimon
committed
e5cd5a2
add master header to list, list all users and user page
kiglarka
committed
2f95b76
adding answer get css style, focus set
Rhyvan
committed
748b4ec
resolve sort issue
kiglarka
committed
ae9f96f
Merge branch 'development' of github.com:balintsimon/ask-mate-python into database
kiglarka
committed
a5abaac
finished new question modal
Tajti Bendegúz
committed
596f7f1
solve merge conflict
Tajti Bendegúz
committed
f07cd51
fix deletion
balintsimon
committed
a378a58
modify css to change hover color in nav links
kiglarka
committed
d1fdf24
Merge branch 'development' of github.com:balintsimon/ask-mate-python into development
balintsimon
committed
5cd9329
add master header
kiglarka
committed
8d8e705
Merge branch 'development' of github.com:balintsimon/ask-mate-python into development
kiglarka
committed
9462d71
fix display
Rhyvan
committed
9747c8d
hotfix for ask question
Tajti Bendegúz
committed
d86f165
add reputation calculation for answer acceptance
balintsimon
committed
7d0cde1
fix minor display problems on question page
Rhyvan
committed
48c034f
add user link in navigation
kiglarka
committed
1472155
resolve mere conflicts
kiglarka
committed
eb23e6e
fix modal box
balintsimon
committed
7ad264c
Add links to login, register page
balintsimon
committed
ff67932
fix reputation on question user
balintsimon
committed
9b08259
Hide vote arrows upon user's vote
balintsimon
committed
ad8f16a
fix answer vote arrow hide by Andi
balintsimon
committed
f511a1a
update SQL with admin data to pre-defined questions and answers
balintsimon
committed
292846e
revert edit question page style to old design
balintsimon
committed
3a9d71d
add new styling and appereance to add_comment blocks
Rhyvan
committed
b8856aa
fix accepting answer
balintsimon
committed
dc29991
fix delete question link
balintsimon
committed
15dd9af
fix show question without user logged in
balintsimon
committed
0e6104b
fix modal design difference between add and edit question
Tajti Bendegúz
committed
44cfbe6
Merge branch 'development' of https://github.com/balintsimon/ask-mate-python into development
Tajti Bendegúz
committed
e54f739
fix delete question issue on accepted answer
balintsimon
committed
ba93786
fix ask question without user
balintsimon
committed
dc203cf
question page design is now more clean
Tajti Bendegúz
committed
ec12a16
Merge branch 'development' of https://github.com/balintsimon/ask-mate-python into development
Tajti Bendegúz
committed
ef499d9
modify add comment display, and add link to userpage
Rhyvan
committed
a94abf6
merge mew comment style to dev
Rhyvan
committed
4f11188
login design adjust
Tajti Bendegúz
committed
772e7f9
Merge branch 'development' of https://github.com/balintsimon/ask-mate-python into development
Tajti Bendegúz
committed
d59130e
modal box placed higher
Tajti Bendegúz
committed
e62ca89
vote arrows change
Tajti Bendegúz
committed
4cf8b35