Merge branch v1.0.2 to develop#38

Open

danibazi9 wants to merge 428 commits intodevelopfrom

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

Commits on Apr 25, 2021

Fix get villa API by villa ID to return document file urls, not document_id
danibazi9
committed
Change get villa API by villa ID to hide/unhide villa
danibazi9
committed

Commits on Apr 26, 2021

Commits on Apr 29, 2021

Make chat app
sadeghjafari5528
committed

Commits on May 3, 2021

add staticfiles
sadeghjafari5528
committed
delete db and procfile
sadeghjafari5528
committed
fix bug of villa-search
sadeghjafari5528
committed
Set 'me' in query parameters of get all villas API to show villas of owner
danibazi9
committed
Update .gitignore
danibazi9
committed
add image field to result of villa-search
sadeghjafari5528
committed

Commits on May 4, 2021

Fix VillaSearchSerializer image field
sadeghjafari5528
committed
Fix some bugs of chat app and write some tests for chat_models
sadeghjafari5528
committed
change db
sadeghjafari5528
committed
add media urls
sadeghjafari5528
committed
clear data and images
sadeghjafari5528
committed
Add first_name, last_name & image of villa's owner to get villa info API
danibazi9
committed

Commits on May 5, 2021

Commits on May 7, 2021

Commits on May 8, 2021

Write unit tests for register villa by the user
danibazi9
committed
Merge branch 'v1.0.1' into feature/villa
danibazi9
authored
Merge pull request #22 from danibazi9/feature/villa
danibazi9
authored
Merge pull request #23 from danibazi9/v1.0.1
danibazi9
authored
Merge branch 'v1.0.1' into feature/register-villa
danibazi9
authored
Merge pull request #24 from danibazi9/feature/register-villa
danibazi9
authored
Merge pull request #25 from danibazi9/v1.0.1
danibazi9
authored
Merge branch 'v1.0.1' of https://github.com/danibazi9/SoftwareCheetahsBackEnd into v1.0.1
danibazi9
committed
Nothing
danibazi9
committed
Remove Procfile & dp.sqlite
danibazi9
committed
final testing
sadeghjafari5528
committed
Merge branch 'deploy' of https://github.com/danibazi9/SoftwareCheetahsBackEnd into deploy
sadeghjafari5528
committed
final testign
sadeghjafari5528
committed
final test for chat
sadeghjafari5528
committed
Comment tasks.py
danibazi9
authored
fix conflict
sadeghjafari5528
committed
Fix a little bug
danibazi9
committed
Customize Django Administration for Rule model
danibazi9
committed
Add rule in get villa info by villa id
danibazi9
committed
Add rule in get villa info by villa id
danibazi9
authored
Customize Django Administration for Rule model
danibazi9
authored
Fix a little bug
danibazi9
committed
Fix a little bug
danibazi9
authored
solve conflicts
sadeghjafari5528
committed
remove db from gitignore
sadeghjafari5528
committed
Return 400 request if 'start_date' & 'end_date' isn't be in the request body.
danibazi9
committed

Commits on May 20, 2021

fix tests
sadeghjafari5528
committed
fix delete villas
sadeghjafari5528
committed
Delete django_crontab from settings.py apps
sadeghjafari5528
committed
add a villa to database
sadeghjafari5528
committed

Commits on May 22, 2021

add some data to database
sadeghjafari5528
committed
change search functionality
sadeghjafari5528
committed

Commits on May 23, 2021

Commits on May 25, 2021

delete prints from search villa view
sadeghjafari5528
committed
fix bug of check-email-existence
sadeghjafari5528
committed
fix check-email-existence bug
sadeghjafari5528
committed
Add some fixed & special rules for villa.
danibazi9
committed
complete most reserved villas
sadeghjafari5528
committed
complete most rated villas
sadeghjafari5528
committed

Commits on May 26, 2021

make view of most reserved city
sadeghjafari5528
committed

Commits on May 27, 2021

write some test for most popular city
sadeghjafari5528
committed
add / end of some urls
sadeghjafari5528
committed
fix some bug of most popular city
sadeghjafari5528
committed
complete most popular city
sadeghjafari5528
committed
Deploy into IUST server
danibazi9
committed
change branch
sadeghjafari5528
committed
Update .gitignore
danibazi9
committed
merge with feature
sadeghjafari5528
committed
edit gitignore file
sadeghjafari5528
committed
edit database
sadeghjafari5528
committed
improve most popular city
sadeghjafari5528
committed
complete calendar
sadeghjafari5528
committed

Commits on May 28, 2021

Commits on May 30, 2021

Add list of rules in get all villas info API response
danibazi9
committed

Commits on Jun 1, 2021

fix some bugs
sadeghjafari5528
committed
fix migrations confilict
sadeghjafari5528
committed
solve conflict
sadeghjafari5528
committed
try to make create_message function for chat
sadeghjafari5528
committed

Commits on Jun 7, 2021

complete chat authentication
sadeghjafari5528
committed
almost complete functionality of chat
sadeghjafari5528
committed

Commits on Jun 12, 2021

complete add and show chat with test
sadeghjafari5528
committed
start villa rate
sadeghjafari5528
committed

Commits on Jun 13, 2021

complete add villa_rate and show villa_rate
sadeghjafari5528
committed
fix some bug of chatroom
sadeghjafari5528
committed
fix client_test2.py
sadeghjafari5528
committed
Check for 400 response if there aren't "message" & "title" in request body
danibazi9
committed

Commits on Jun 16, 2021

Commits on Jul 1, 2021

Create an API to return all villas liked by each user
danibazi9
committed

Commits on Jul 2, 2021

Commits on Jul 10, 2021

Commits on Jul 11, 2021