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

Current works on Parkstay + Django 1.10 upgrade #168

Merged
merged 769 commits into from
Jan 10, 2017
Merged

Current works on Parkstay + Django 1.10 upgrade #168

merged 769 commits into from
Jan 10, 2017

Conversation

scottp-dpaw
Copy link

@scottp-dpaw scottp-dpaw commented Jan 10, 2017 •
edited by dbca-asi
Loading

All commits previously reviewed as pull requests to parkstay branch

This change is Reviewable

tawazz and others added 30 commits November 30, 2016 15:53
@tawazz
Merged branch parkstay into tawanda-parkstay
d689962
@tawazz
remove campsite id
5459f87
@tawazz
move to databale component and remove campground id
14c706e
@tawazz
reorder buttons to ok -> cancel and remove red cancel button
5b10c8b
@tawazz
align datatable content in the middle
06d60cc
@rayrayndwiga
Merge pull request dbca-wa#32 from rayrayndwiga/tawanda-parkstay
83a1ccc 
Feedback changes
@rayrayndwiga
Merge branch 'master' of https://github.com/rayrayndwiga/ledger into …
91aa8cf 
…parkstay
@rayrayndwiga
Merge branch 'parkstay' of https://github.com/rayrayndwiga/ledger int…
1f190e2 
…o parkstay
@tawazz
implement feedback changes
57a60d3
@rayrayndwiga
parkstay: added price history table
70b3bb8
@rayrayndwiga
Merge pull request dbca-wa#33 from rayrayndwiga/tawanda-parkstay
74b111e 
implement feedback changes
@rayrayndwiga
Merge branch 'parkstay' of https://github.com/rayrayndwiga/ledger int…
be487bf 
…o parkstay
@rayrayndwiga
parkstay: added campsites to campsite_class serializer
13f13e8
@rayrayndwiga
parkstay: add related name in campsite_class
47a50c6
@tawazz
scope modal css
cf372f1
@rayrayndwiga
parkstay: add property to campsite class to check if it can add a rate
b394b49
@rayrayndwiga
Merge branch 'parkstay' of https://github.com/rayrayndwiga/ledger int…
cd32fd9 
…o parkstay
@rayrayndwiga
parkstay: display add price history button depending on campsite_type…
3cfc3f3 
… property
@brendanc-dpaw
attempt adding bulk pricing component
9cb1a25
@rayrayndwiga
parkstay: finish up on campsite type price history
7e6e902
@tawazz
Merged parkstay into tawanda-parkstay
0083872
@tawazz
fix alignment issues
bdf3228
@tawazz
Merged tawanda-parkstay into parkstay
0cd29ae
@rayrayndwiga
parkstay: create new campsite rates if another campsite class rate ex…
bfd8ff5 
…ists
@rayrayndwiga
parkstay: template edits
d03f1ba
@rayrayndwiga
parkstay: skip if the table is not yet created
445e9d5
@rayrayndwiga
parkstay: fixed typo
e79d2f9
@dbca-asi
Merge pull request dbca-wa#158 from rayrayndwiga/parkstay
2e1c9c4 
Parkstay: Campsite Type Components and Campsite Type Price History
@tawazz
Merged branch parkstay into tawanda-parkstay
bc4e0b8
@brendanc-dpaw
Merge branch 'parkstay' of https://github.com/parksandwildlife/ledger …
b07db1b 
…into parkstay
tawazz and others added 24 commits December 19, 2016 16:20
@tawazz
Merged tawanda-parkstay-booking into tawanda-parkstay
8693a2a
@brendanc-dpaw
Merge branch 'parkstay' of https://github.com/parksandwildlife/ledger …
9254c26 
…into parkstay

Conflicts:
	parkstay/frontend/parkstay/src/apps/main.js
@tawazz
booking first level search
a6e299b
@tawazz
first level search button implementation
e4b821f
@tawazz
Merged tawanda-parkstay into parkstay
130c52c
@dbca-asi
Merge pull request dbca-wa#165 from scottp-dpaw/mapdemo
f1ce6b3 
Map screen widgets
parkstay.map: add region/park/district to JSON
27dbd2c
ledger.map: add filtering by dates
7254eab
@brendanc-dpaw
Merge branch 'parkstay' of https://github.com/parksandwildlife/ledger …
24bb7a8 
…into parkstay
@brendanc-dpaw
parkstay.frontend: fix build_dev to output source map
08e5282
Merge branch 'parkstay' of https://github.com/parksandwildlife/ledger …
1b0bb0b 
…into mapdemo
parkstay.Campsite: make CampsiteClass duplicate fields first-class to…
589a490 
… save an expensive cross join
Merge branch 'parkstay' of https://github.com/parksandwildlife/ledger …
f15718b 
…into parkstay
Merge branch 'mapdemo' into parkstay
1cd1689
parkstay.map: pass gear type as filter parameter
71d0433
parkstay.map: make search AJAX calls tiny
6da1ef5
parkstay.map: map update almost works as it should
95d16fb
parkstay.map: live filtering works
ab458bf
parkstay.map: add pagination
b427f84
parkstay.map: add more scaffolding
e5bda12
parkstay.map: placeholders
1a23aca
ledger: django v1.10 porting frenzy
7014810
merge from master
0e97916
ledger: final migrations commit
9fac0c7
@coveralls
Copy link

coveralls commented Jan 10, 2017 •
edited
Loading

Coverage Status

Changes Unknown when pulling 9fac0c7 on scottp-dpaw:parkstay_pay into ** on parksandwildlife:master**.

@dbca-asi dbca-asi merged commit ef8447c into dbca-wa:master Jan 10, 2017
dbca-asi pushed a commit that referenced this pull request Jun 20, 2017
@serge-gaia
Merge pull request #168 from gaiaresources/3226-default-licence-period
ee614fb 
Default period for licence
dbca-asi pushed a commit that referenced this pull request Apr 15, 2019
@wilsonc86
Merge pull request #168 from wilsonc86/4881_dashboard_work
fb9dc25 
4881 dashboard work
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@scottp-dpaw @coveralls @dbca-asi @tawazz @rayrayndwiga @brendanc-dpaw