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

Tidy initial docs PR #2

Merged
merged 133 commits into from
Jun 26, 2024
Merged

Tidy initial docs PR #2

merged 133 commits into from
Jun 26, 2024

Conversation

edwardchalstrey1
Copy link

@edwardchalstrey1 edwardchalstrey1 commented Jun 26, 2024 •
edited
Loading

edwardchalstrey1 and others added 30 commits May 24, 2024 14:15
@edwardchalstrey1
supress current borders spinner
df53cdc
@edwardchalstrey1
stop loading wheel after one year loaded
0a37c30
@edwardchalstrey1
bring back loading indicator when adjusting the year if not all polit…
70c2eb4 
…ies loaded
@edwardchalstrey1
reload world_map_one_year multiple times
b3c4732
@MajidBenam
made the option to add suc and prec pols more userfriendly
ae5fbfc
@edwardchalstrey1
update gitignore to allow notebooks
07503fb
@edwardchalstrey1
initial setup
c658042
@edwardchalstrey1
note
ddd9d50
@edwardchalstrey1
specify 3.11
e4ca9ba
@edwardchalstrey1
jupyter kernel instructions
2550efa
@edwardchalstrey1
basic notebook works
ba76735
@edwardchalstrey1
colours
4a86dad
@edwardchalstrey1
remove extra cells
725437d
@edwardchalstrey1
translucent fill
59ddce9
@edwardchalstrey1
add end years
f113e92
@edwardchalstrey1
load shapes for a particular year
eb64d49
@edwardchalstrey1
map function
90c4ea3
@edwardchalstrey1
use whole world map limits
daef20f
@edwardchalstrey1
finish prev commit
a64d349
@edwardchalstrey1
add gadm
041ce53
@edwardchalstrey1
use cartodb basemap
fa01014
@edwardchalstrey1
adjust coordinates properly for basemap
9041fbd
@edwardchalstrey1
use folium
c8dd5e4
@edwardchalstrey1
zoom folium map correctly
47661b2
@edwardchalstrey1
separate by colours properly
0061b49
@edwardchalstrey1
add a widget for the year
9e65ff6
@edwardchalstrey1
add slider
cb0f8f4
@MajidBenam
made the insertion of descriptions more user friendly
c02f98f
@edwardchalstrey1
add play button non functional
8543b70
@edwardchalstrey1
play button works
63b2e97
@edwardchalstrey1
set slider ticks in world map
fde5b2c
@edwardchalstrey1
update ticks once everything loaded
e604491
@edwardchalstrey1
add override_latest_year
40f3d26
@edwardchalstrey1
show initial ticks
a0760b5
@edwardchalstrey1
add comment
bbaa7d7
@edwardchalstrey1
hide slider before all polities loaded
38f9c17
@edwardchalstrey1
fix display year
5e8f302
@edwardchalstrey1
restore slider initially
bdf39f7
@edwardchalstrey1
improve text
82a6b95
@edwardchalstrey1
make previous variable button smaller
4c2598d
@edwardchalstrey1
reduce side panel width
3c537bc
@edwardchalstrey1
put year at top
623168d
@edwardchalstrey1
move speed to centre
f6a4063
@edwardchalstrey1
increase size of polity map window
4c53760
@edwardchalstrey1
Merge pull request #170 from edwardchalstrey1/aesthetics-19-June
919c706 
Update world map and polity map look and feel
@edwardchalstrey1
change gadm fill colour to white
6b593c3
@edwardchalstrey1
Merge branch 'Qing' into Qing-merge-25june
9f1fcaa
@edwardchalstrey1
Merge pull request #174 from edwardchalstrey1/Qing-merge-25june
509f316 
Merge latest updates from upstream Qing branch 25 June 2024
@edwardchalstrey1
link to pulumi docs
4eedf06
@edwardchalstrey1
refactor pulumi stack setup doc
63a01a4
@edwardchalstrey1
de-duplicate pulumi stack info
48c03f0
@edwardchalstrey1
improve virtual env suggestion
21ead0a
@edwardchalstrey1
fix rst link
305ecf3
@edwardchalstrey1
remove hint as link wasn't working
caf3f61
@edwardchalstrey1
update spatialdb link again
1a1b90d
@edwardchalstrey1
restore hint and fix link by adding underscore
09d519f
@edwardchalstrey1
Merge branch 'dev' into adding-docstrings
7eb62c1
@edwardchalstrey1
Copy link
Author

edwardchalstrey1 commented Jun 26, 2024 •
edited
Loading

I've made a mistake here, there's some parts being overwritten by the dev branch merge that I didn't intend - actually no this is fine @kallewesterling if you merge this then the changes on your PR should only be the changes to the docs you made

@kallewesterling kallewesterling merged commit 7fbd27a into kallewesterling:adding-docstrings Jun 26, 2024
@kallewesterling
Copy link
Owner

merged. @edwardchalstrey1 !

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.
3 participants
@edwardchalstrey1 @kallewesterling @MajidBenam