Develop - #7

Open

Zollli wants to merge 136 commits into

CodecoolBase:masterfrom

borosTamas:develop

Commits on Feb 12, 2019

Make files
borosTamas
committed
b0463d5
index template, collect questions
borosTamas
committed
7b77c7a

Commits on Feb 13, 2019

commit before the lunch just for safe
borosTamas
committed
cc6e6bb
aííaíí
LibLev
committed
9a00662
It works now
borosTamas
committed
b2e4550
Merge remote-tracking branch 'origin/master'
LibLev
committed
9829b27
collect answer
LibLev
committed
427a940
question page looks shit but works
borosTamas
committed
c2f22c5
Merge remote-tracking branch 'origin/master'
borosTamas
committed
419ed20
question page looks bad but its working
borosTamas
committed
be35d50
implement add new question, write to csv in progress
Zollli
committed
23b9ae4
Merge remote-tracking branch 'origin/master'
Zollli
committed
afe3262
question page looks better
borosTamas
committed
5a4794c
Merge branch 'master' of https://github.com/borosTamas/ask-mate-python
borosTamas
committed
76f8766
upgradet question page with answers
borosTamas
committed
1666314
add answer
LibLev
committed
f1bcec0
Merge remote-tracking branch 'origin/master'
LibLev
committed
cc6ed68
there is a problem with the file path
borosTamas
committed
1f8f677

Commits on Feb 14, 2019

implement add questions write to file, add questions in index page
Zollli
committed
48d7617
dani belenyult
LibLev
committed
915b233
Merge remote-tracking branch 'origin/master'
LibLev
committed
e5a69ef
dani belenyult
LibLev
committed
fb3d9b8
Merge branch 'master' of /home/boros/codecool/web_sql/ask-mate-python with conflicts.
borosTamas
committed
9e3dfc5
implement edit questions
Zollli
committed
80cb165
Merge branch 'new_question'
Zollli
committed
f7fc8da
ad question page changed, update question wotking, + submission time
borosTamas
committed
2257c26
Merge remote-tracking branch 'origin/master'
borosTamas
committed
763191e
add answer is fucked the system
LibLev
committed
5b7bd87
Merge remote-tracking branch 'origin/master'
LibLev
committed
3610430
vote counter
borosTamas
committed
ed04bd0

Commits on Feb 18, 2019

Dani belenyúlt...
LibLev
committed
12f751e
Most megint működik
borosTamas
committed
95212c3

Commits on Feb 25, 2019

add sql sample data

lterray
authored and
borosTamas
committed
ca12f5b

Commits on Feb 26, 2019

connenction been updated
LibLev
committed
0d66ea8
collect question and answer, show question
borosTamas
committed
2fd850f
collect question and answer, show question
borosTamas
committed
b829aa1
update question/answer and add answer are ready to use
LibLev
committed
f6466d7
write q/a in progress
Zollli
committed
086b4a2
view number ready
borosTamas
committed
da13e70
megy a baszakodás
LibLev
committed
f31186e
post answer
LibLev
committed
c5e4dac
write q/a in progress
Zollli
committed
b9b6a6c
Merge branch 'master' of https://github.com/borosTamas/ask-mate-python
Zollli
committed
3077629
ADD_question complete
Zollli
committed
ab04c26
edit answer is ready to use
LibLev
committed
855b84c
Merge remote-tracking branch 'origin/master'
LibLev
committed
15e9640

Commits on Feb 27, 2019

add question been fixed
LibLev
committed
cbe05de
show top 5 question and show all question
LibLev
committed
9a019b3
search question kinda working
borosTamas
committed
533c0b9
vote in progress
Zollli
committed
57647ed
search question kinda working really
borosTamas
committed
74635d6
implemented vote
Zollli
committed
7ecfc16
Merge branch 'master' of https://github.com/borosTamas/ask-mate-python
Zollli
committed
35398da
Merge branch 'vote'
Zollli
committed
80c6cf1
all question html added
LibLev
committed
f0d6d12
Merge branch 'master' of /home/boros/codecool/web_sql/ask-mate-python with conflicts.
borosTamas
committed
e223d15
sort is fuckin' ready
LibLev
committed
e041f89
Merge remote-tracking branch 'origin/master'
borosTamas
committed
71b1ae6
add comment to question
borosTamas
committed
15f658f
we get delete question back
borosTamas
committed
090bcfb
question page been edited
LibLev
committed
653f3f2
vote been fixed
LibLev
committed
632bca0

Commits on Feb 28, 2019

add comment in progress
LibLev
committed
9a68a9c
Add comment to answer is ready, more info in the main page
borosTamas
committed
4284742
search works everywhere
borosTamas
committed
9b3e027
css in progress
Zollli
committed
8e66b19
really working show comments
borosTamas
committed
499ee04
Merge branch 'css'
Zollli
committed
a69f912
Merge remote-tracking branch 'origin/master'
borosTamas
committed
f7d956e
css in progress
Zollli
committed
b57fbcc
Merge remote-tracking branch 'origin/master'
borosTamas
committed
b02400f
somewhere in the way of css
borosTamas
committed
ef04372
css in progress
Zollli
committed
e3f472f
Merge branch 'master' into css
Zollli
committed
31fafbb
css index,all question,home finished
Zollli
committed
82f0854
vote fixed
Zollli
committed
11bcf0d
last push i hope, edit answer and ediq question, drops back to question page
borosTamas
committed
23cf800

Commits on Mar 4, 2019

valami
LibLev
committed
8cacf60

Commits on Mar 11, 2019

css has been updated
LibLev
committed
a3e90c5
new background
LibLev
committed
d0070df
add sql sample data

lterray
authored and
borosTamas
committed
e1a0fb4
Remove drop sequence from sample SQL

szrudi
authored and
borosTamas
committed
d1b3c59
question_data_manager
LibLev
committed
a18fb89
add answer_data_manager.py
Zollli
committed
eb68812
Merge branch 'hotfix/answer_comment' into develop
borosTamas
committed
8178179
Hotfix on show all comments for an answer
borosTamas
committed
dd3adab
Merge branch 'question_manager' into develop
Zollli
committed
12830f7
Merge branch 'develop' of https://github.com/borosTamas/ask-mate-python into develop
borosTamas
committed
03b2932
deleted data_manager, comment_data_manager created,
Zollli
committed
cf82454

Commits on Mar 12, 2019

user table has been created in database
LibLev
committed
0184b38
login buttons and html
borosTamas
committed
2647c89
Merge remote-tracking branch 'origin/develop' into develop
borosTamas
committed
0ad1da5
added vote to answer
Zollli
committed
d32bc8b
Merge branch 'vote_answer' into develop
Zollli
committed
003896b
fixed comment_data_manager
Zollli
committed
2a094f5
registration complete
borosTamas
committed
21a2572
Merge branch 'develop' into registration
Zollli
authored
d762705
registration complete
borosTamas
committed
d227126
login in progress:
LibLev
committed
41cb51c
Merge branch 'develop' into loginfeature
LibLev
committed
503e0b4
login in server almost done...
LibLev
committed
4f3e5a2
just save
borosTamas
committed
e8881b7
fixed askmate sql, deleted head<<<---
Zollli
committed
a82da19
Merge remote-tracking branch 'origin/loginfeature' into gain_reputation
borosTamas
committed
3304697
too many changes is one brach, add user id for new question and answer, find user id by username
borosTamas
committed
873ddb1
Merge remote-tracking branch 'origin/gain_reputation' into loginfeature
LibLev
committed
f2a1615
now you can log in but if you do anything on the page its automaticaly logout... it have to fix and the logout its not working YET
LibLev
committed
5e1d2e3
now you can login and logout but if you want to open an other page its automatically logout...
LibLev
committed
fc949cf
signin button has been changed
LibLev
committed
06a867c

Commits on Mar 13, 2019

Merge branch 'loginfeature' into List_users
borosTamas
committed
cabf9a9
list all users
borosTamas
committed
275a1cf
Merge branch 'gain_reputation' into acept_answer_feature
borosTamas
committed
6adb96a
now you can login and if you go any other page from the index it's stay logged in, but unfortunatelly the login message don't show up.
LibLev
committed
2dc968f
merge thing
borosTamas
committed
49300a4
Merge branch 'loginfeature' into acept_answer_feature
borosTamas
committed
ee8a8ca
accept answer done
borosTamas
committed
b6c95e4
sho images from url
borosTamas
committed
887ae50
now you can login and stay login, if you try to use an invalid username or password you'll get an invalid message, and you can logout
LibLev
committed
676f091
bind comment to user merged
borosTamas
committed
35c85e2
Merge remote-tracking branch 'origin/develop' into develop
LibLev
committed
69d3b27
now you can login and stay login, if you try to use an invalid username or password you'll get an invalid message, and you can logout
LibLev
committed
fd25b06
reputation answer, question vote up,down ready
Zollli
committed
6fdc3a0
Merge branch 'answer_reputation' into develop
Zollli
committed
ed73ffa
save progress
borosTamas
committed
140b49b
now its ugly but its working
LibLev
committed
0c7f5f4
css table are looking superb >.<
LibLev
committed
fd0213f
save progress2
borosTamas
committed
fc0433d
Merge branch 'develop' into user_page
borosTamas
committed
655cd21
asdasdasd
LibLev
committed
5282ce6
save progress3
borosTamas
committed
edc0072
Merge branch 'develop' into user_page
borosTamas
committed
64f5fd6
save progress4, minor bugfixes
borosTamas
committed
e95e4ab
logout burn in user page, defaultbutton has been created
LibLev
committed
91241f7
done
borosTamas
committed
d73c99f
Merge remote-tracking branch 'origin/develop' into develop
borosTamas
committed
bdff83f
bugfix on redirect
borosTamas
committed
2b0de6e