Hugh Rundle
301e0e419d
fix action conflict
...
The add-contributors action and the update-topo action both want to check out the current branch and add a commit at the same time, which causes conflicts. This adds contributors as part of the update-topo action and prevents the contributor update action running if `library_services_information.csv` has changed in the original commit.
2021-02-06 12:37:51 +11:00
Library Map Bot
f801406112
update contributors
2021-02-06 01:19:05 +00:00
Hugh Rundle
e6fda2860b
Merge pull request #113 from hughrun/lachlan
...
Lachlan
2021-02-06 12:18:41 +11:00
Hugh Rundle
94609138c8
Upper Lachlan is fine free
2021-02-06 12:15:47 +11:00
Hugh Rundle
459f0b22d0
add default username to Actions
...
- avoids adding GitHub usernames instead of names when adding automated commits e.g. updating the name file.
Also cleaned up contributors.txt
2021-02-06 12:12:15 +11:00
hughrun
0db9ad0433
update contributors
2021-02-05 10:46:58 +00:00
Hugh Rundle
b3e138b04e
Merge pull request #112 from madradish/master
...
Adding websites
2021-02-05 21:46:33 +11:00
Hugh Rundle
8b1a3ec7cd
Merge branch 'master' into master
2021-02-05 21:44:43 +11:00
hughrun
047032921a
merge csv data to topo
2021-02-05 10:40:19 +00:00
Hugh Rundle
7876ba2427
Merge branch 'madradish-master'
2021-02-05 21:39:35 +11:00
Hugh Rundle
b54ac7874c
resolve merge conflict
2021-02-05 21:39:07 +11:00
Hugh Rundle
2c3cd34cd3
update workflows
...
- PR are now only tagged
- topo merge is done on push to master, not as part of PR
- this should resolve problems with arbitrary forked branches
2021-02-05 21:20:02 +11:00
Molly
d704bde399
Add files via upload
...
Adding websites for WA, NT, NSW
2021-02-05 15:48:29 +08:00
Molly
6285577b6a
Merge pull request #1 from madradish/madradish-websites-1
...
Add files via upload
2021-02-05 15:19:00 +08:00
Hugh Rundle
2ac77f3959
Merge pull request #111 from sallybaker/master
...
add Qld website URLs
2021-02-05 18:07:59 +11:00
sallybaker
8245f70f9f
merge csv data to topo
2021-02-05 06:59:59 +00:00
sallybaker
cd1f1cbf0c
add Cloncurry to Southern Downs qld URLs
2021-02-05 16:49:19 +10:00
Molly
055a57ae26
Add files via upload
...
Added websites for WA, NSW, NT
2021-02-05 10:03:26 +08:00
sallybaker
e6e60d177e
add Cassowary to Cherbourg Qld URLs
2021-02-03 21:17:00 +10:00
hughrun
de19a93a50
update contributors
2021-02-02 09:23:02 +00:00
Hugh Rundle
65491d9675
Merge pull request #108 from hughrun/update-websites
...
add some nsw websites
2021-02-02 20:22:16 +11:00
hughrun
a7fca9e824
merge csv data to topo
2021-02-02 09:21:54 +00:00
Hugh Rundle
5c47ed8b99
add some nsw websites
2021-02-02 20:20:56 +11:00
Hugh Rundle
24cbf65f22
Merge pull request #107 from sallybaker/QLD-loans
...
Qld loans
2021-02-02 20:05:26 +11:00
sallybaker
e955aba744
Merge branch 'master' into QLD-loans
...
merge updated upstream into branch
2021-02-02 18:04:55 +10:00
Hugh Rundle
a7ab8d399a
Update update-topo-on-info-pr.yml
...
remove `head_ref` reference from actions/checkout to resolve error (see https://github.com/actions/checkout/issues/275 )
2021-02-02 18:10:48 +11:00
sallybaker
4dbe9f0da2
update winton and weipa loan period
2021-02-02 08:48:40 +10:00
hughrun
f1e73bfd0a
update contributors
2021-02-01 21:35:08 +00:00
Hugh Rundle
2d67e1f047
Merge pull request #101 from sallybaker/master
...
fix typos in contributing.md
2021-02-02 08:34:39 +11:00
sallybaker
39bd2aab4b
add loan periods for QLD libraries
2021-02-01 22:33:37 +10:00
sallybaker
d3433df682
fix typos in contributing.md
2021-02-01 21:18:07 +10:00
Hugh Rundle
fb0c352f24
Merge pull request #99 from hughrun/geo-to-topo
...
Update TopoJSON boundaries
2021-02-01 20:06:13 +11:00
Library Map Bot
b58ee81a67
Update TopoJSON boundaries
2021-02-01 09:01:21 +00:00
Hugh Rundle
9070588026
Merge pull request #98 from hughrun/auto-commit-fix
...
Auto commit & ACT regression fixes
2021-02-01 20:00:24 +11:00
Hugh Rundle
766d6b2bfe
fix ACT in GeoJSON
...
ACT was listed as "Act": regression from 100f314743
Fixes #97
2021-02-01 19:56:26 +11:00
Hugh Rundle
65b3d2a70b
fix commiter name on topo update action
2021-02-01 19:47:36 +11:00
hughrun
7619f02733
update contributors
2021-02-01 05:28:49 +00:00
Hugh Rundle
eaea51a1d7
Merge branch 'master' of github.com:hughrun/public_library_map
...
align local and remote
2021-02-01 16:27:47 +11:00
Hugh Rundle
cf06a819cc
exclude hughrun from contributors
2021-02-01 16:27:14 +11:00
Hugh Rundle
e24380ee63
Merge pull request #96 from hughrun/campbell-typo
...
fix typo in campbelltown nsw name
2021-02-01 16:14:43 +11:00
hughrun
018e26205e
merge csv data to topo
2021-02-01 05:14:28 +00:00
Hugh Rundle
5ae9920a67
fix typo in campbelltown nsw name
2021-02-01 16:13:31 +11:00
Hugh Rundle
d05f7ba683
Merge pull request #94 from hughrun/geo-to-topo
...
Update TopoJSON boundaries
2021-02-01 16:07:06 +11:00
hughrun
339280186a
Update TopoJSON boundaries
2021-02-01 05:02:05 +00:00
hughrun
a7411ef335
update contributors
2021-02-01 05:01:40 +00:00
Hugh Rundle
5733d19e02
Merge pull request #93 from hughrun/campbelltown
...
Campbelltown
2021-02-01 16:01:13 +11:00
hughrun
f22c8bd151
merge csv data to topo
2021-02-01 04:59:55 +00:00
Hugh Rundle
100f314743
disambiguate campbelltown
...
- Campbelltowns are now Campbelltown (SA) and Campbelltown (NSW)
- Inverell is now fine free!
2021-02-01 15:54:19 +11:00
Hugh Rundle
3033443688
updated gitignore
2021-02-01 14:30:35 +11:00
hughrun
8e9e058dd0
update contributors
2021-01-31 10:29:27 +00:00