Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge branch v1.0.2 to develop #38

Open
wants to merge 428 commits into
base: develop
Choose a base branch
from
Open

Merge branch v1.0.2 to develop #38

wants to merge 428 commits into from

Conversation

danibazi9
Copy link
Owner

Have to be reviewed by Mr.Erfanian Omidvar (P.O)

danibazi9 and others added 30 commits April 25, 2021 22:04
@danibazi9
Fix get villa API by villa ID to return document file urls, not docum…
cd70cc6 
…ent_id
@danibazi9
Change get villa API by villa ID to hide/unhide villa
f085130
add admin of calendar
8647639
Merge branch 'feature/villa' of https://github.com/danibazi9/Software…
89b5a54 
…CheetahsBackEnd into deploy
@danibazi9
Add names to the urls of Villa apis to use in tests
0c844ed
@danibazi9
Add name to the urls of account apis to use in tests
e4d2ef8
@danibazi9
Write unit tests for get all villas API
af7d631
@danibazi9
Write unit tests for upload image for villa API
6d1c183
@danibazi9
Write unit tests for upload document for villa API
39ba223
@danibazi9
Write unit tests for add villa API
eda59d0
@danibazi9
Write unit tests for account document model
e9050f6
@danibazi9
Nothing
f1b2762
@danibazi9
Add visible to Villa model & Django Admin for hide/unhide villa
4cbd230
@danibazi9
Merge branch 'deploy' into feature/villa
2520334
@danibazi9
Merge pull request #13 from danibazi9/feature/villa
94e75ea 
Merge branch Feature/villa to deploy
update databse
c6a9f8d
Make chat app
bd10bdc
@danibazi9
Add calendar_id field to Calendar table
43e2d73
@danibazi9
Merge pull request #15 from danibazi9/feature/calendar
be3fc10 
merge branch feature/calendar to v1.0.0
@sadeghjafari5528
Delete db.sqlite3
af23de9
@danibazi9
Merge pull request #16 from danibazi9/feature/search-villa
4972414 
merge branch feature/search-villa to v1.0.0
@sadeghjafari5528
Merge branch 'v1.0.0' into feature/villa
ac4eda3
@sadeghjafari5528
Merge pull request #14 from danibazi9/feature/villa
0ebfd16 
Merge branch Feature/villa to v1.0.0
add staticfiles
30629d0
delete db and procfile
a80e863
fix bug of villa-search
e8e57cc
@danibazi9
Set 'me' in query parameters of get all villas API to show villas of …
d056753 
…owner
@danibazi9
Update .gitignore
df1843c
add image field to result of villa-search
d28000d
Fix VillaSearchSerializer image field
e0a98ab
danibazi9 and others added 30 commits July 9, 2021 21:15
@danibazi9
Write unit tests for get favorite villa of each user API
87ca270
@danibazi9
Change villa info API to return 'reserved' boolean field in villa det…
0d4f4e5 
…ails body
@danibazi9
Nothing
aea108a
@danibazi9
Return 400 response for push notif API when 'message' & 'title' don't…
5db8f47 
… come in request body
@danibazi9
Create an API to check postal code (postal code of villas must be uni…
81af038 
…que)
@danibazi9
Write unit tests for check postal code API
22bdcca
@danibazi9
Create API to create/modify GSM device info
3720570
@danibazi9
Add url for create/modify FCM device
f133c11
@danibazi9
Merge pull request #54 from danibazi9/feature/push_notification
daae8a9 
Merge branch feature/push_notification to v1.0.2
@danibazi9
Fix a bug in modify device info
916d63a
@danibazi9
Send push notification when add new villa
53c059c
@danibazi9
Fix a bug
03b4038
@danibazi9
Send push notification to all users when a new villa is added
2b59ad9
@danibazi9
Send push notification to guest & host when reserving a new villa
8e68e17
complete payment
22de802
add currency to serializers
a5d7a01
complete cancel reserve
08f88c1
@danibazi9
Fix some bugs
b832c4a
@danibazi9
Setup Cronjob for scheduling push notification for reserve
062b733
@danibazi9
Setup Cronjob for scheduling push notification for cancel reservation
55b7bef
@danibazi9
Add calendar_id to response of get reserved villa for each user API
de4adb2
Merge branch 'feature/vill_rate' of https://github.com/danibazi9/Soft…
310ef43 
…wareCheetahsBackEnd into v1.0.2
Merge branch 'payment' of https://github.com/danibazi9/SoftwareCheeta…
ef291c7 
…hsBackEnd into v1.0.2
merge payment with v1.0.2
c421400
fix bugs
ed67c25
@danibazi9
Change representation of show reserved/hosted info API
f367a9f
@danibazi9
Fix a bug in show villa detail
cf1e076
@danibazi9
Fix a bug in show hosted villas info
da70daf
@danibazi9
Fix a bug
a0d3ea7
@danibazi9
Send push notification to reciever message in chat
a381c2c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alierfanianomidvar alierfanianomidvar Awaiting requested review from alierfanianomidvar

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@danibazi9 @sadeghjafari5528