Develop#6

Open

andris9016 wants to merge 164 commits intoCodecoolBase:masterfrom

andris9016:develop

Commits on Feb 5, 2019

Add list.html
andris9016
committed

Commits on Feb 6, 2019

Commits on Feb 7, 2019

Commits on Feb 8, 2019

delete utc from both utcfromtimestamp in ddata_manager.py
ivanmatiz
committed

Commits on Feb 19, 2019

play around sample data
ivanmatiz
committed
fixed merge conflict
ivanmatiz
committed
Merge branch 'master' of https://github.com/andris9016/ask-mate-python
ivanmatiz
committed
Add navbar.html to templates
andris9016
committed
Fix database id-s
andris9016
committed
Implement the navbar
andris9016
committed
Change layout
andris9016
committed
route_new_comment, add_comment, newcomment html
ivanmatiz
committed
Implementing "Vote" function for questions

Szabó Gergő
authored and
Szabó Gergő
committed
Correcting "Vote" function for questions

Szabó Gergő
authored and
Szabó Gergő
committed

Commits on Feb 20, 2019

Interpreting "Vote" function for answers

Szabó Gergő
authored and
Szabó Gergő
committed
Reworked "Vote" function display

Szabó Gergő
authored and
Szabó Gergő
committed
minor correction in questiondetails.html

Szabó Gergő
authored and
Szabó Gergő
committed
all day's work disappeared, P.s. git .fuckoff
ivanmatiz
committed
Visual update + data_manager function for reading comment table

Szabó Gergő
authored and
Szabó Gergő
committed
Implement search feature
andris9016
committed
Fix merge conflict
andris9016
committed
Change datetime.now() with no microseconds
andris9016
committed
update an answer function added
jkrisz511
committed
Implement delete answer
andris9016
committed
Add footer to webpage
andris9016
committed

Commits on Feb 21, 2019

Fix merg conflict Krisz
andris9016
committed
Delete footer
andris9016
committed
ivans version
ivanmatiz
committed
fixed merge conflict, Ivan
ivanmatiz
committed
Delete answer feature done
ivanmatiz
committed
Change data_manager
andris9016
committed
Fix merge conflict
andris9016
committed
merge conflicts solved

Szabó Gergő
authored and
Szabó Gergő
committed
Change layout
andris9016
committed
sort questions function added
jkrisz511
committed
Get Krisz changes
andris9016
committed
delete question b version
ivanmatiz
committed
Implemented adding comment to questions and editing comment functions

Szabó Gergő
authored and
Szabó Gergő
committed
fixing merge conflict

Szabó Gergő
authored and
Szabó Gergő
committed

Commits on Feb 22, 2019

final
ivanmatiz
committed
last last final
ivanmatiz
committed
Merge branch 'master' of github.com:andris9016/ask-mate-python
andris9016
committed
Merge branch 'master' of github.com:andris9016/ask-mate-python
andris9016
committed
Question comment buttons corrected

Szabó Gergő
authored and
Szabó Gergő
committed

Commits on Mar 4, 2019

Commits on Mar 5, 2019

Edit question added
jkrisz511
committed
Merge branch 'develop' of https://github.com/andris9016/ask-mate-python into develop
jkrisz511
committed
registration function implemented

Szabó Gergő
authored and
Szabó Gergő
committed
Merge branch 'develop' of https://github.com/andris9016/ask-mate-python into develop

Szabó Gergő
authored and
Szabó Gergő
committed
new route for the the users question
jkrisz511
committed
initial changes in server.py and login.html

Szabó Gergő
authored and
Szabó Gergő
committed
just commit
jkrisz511
committed
delete question feature is done
ivanmatiz
committed
Merge branch 'develop' of https://github.com/andris9016/ask-mate-python
ivanmatiz
committed
deleted rows in data manager
ivanmatiz
committed
Merge branch 'master' into develop
ivanmatiz
committed
checkout for correcting develop branch

Szabó Gergő
authored and
Szabó Gergő
committed
Merge remote-tracking branch 'origin' into develop

Szabó Gergő
authored and
Szabó Gergő
committed
users table not null issue fixed

Szabó Gergő
authored and
Szabó Gergő
committed
Merge branch 'develop' of https://github.com/andris9016/ask-mate-python into develop
ivanmatiz
committed
Merge branch 'master' into develop
andris9016
committed
merge conflict
jkrisz511
committed
Merge branch 'develop' into user_page
jkrisz511
committed
Add users list html
andris9016
committed
login function first try

Szabó Gergő
authored and
Szabó Gergő
committed
Implement users list page
andris9016
committed
Fix merge conflict
andris9016
committed
Merge conflict
andris9016
committed
acception column added to answer table in sql file
ivanmatiz
committed
Fix merge conflict
andris9016
committed
Merge branch 'develop' into user_page
andris9016
committed

Commits on Mar 6, 2019

fix implemented

Szabó Gergő
authored and
Szabó Gergő
committed
Make the comments design better (not in tables)
andris9016
committed
Merge branch 'user_page' into UI
andris9016
committed
login and registration database handling corrected

Szabó Gergő
authored and
Szabó Gergő
committed
accepted answer feature developed for every user
ivanmatiz
committed
login implemented v1.0

Szabó Gergő
authored and
Szabó Gergő
committed
Change question details page layout
andris9016
committed
Make a welcome page
andris9016
committed
Welcome page implemented
andris9016
committed
login session creation and handling added, logout function implemented, navbar extended in correlation with login

Szabó Gergő
authored and
Szabó Gergő
committed
user page function works
jkrisz511
committed
merge conflict solved with origin develop branch

Szabó Gergő
authored and
Szabó Gergő
committed
after merge problems solved

Szabó Gergő
authored and
Szabó Gergő
committed
merge with user page
jkrisz511
committed
user page user check in session added
jkrisz511
committed

Commits on Mar 7, 2019

Commits on Aug 5, 2019

minor data_manager modification

Szabó Gergő
authored and
Szabó Gergő
committed