Commit Graph

1908 Commits

Author SHA1 Message Date
Ed Chalstrey
3ecca95866 dont use export vars 2022-02-08 09:49:42 +00:00
Ed Chalstrey
47449a91c8 switch base docker image to ubuntu/postgres 2022-02-08 09:47:10 +00:00
Ed Chalstrey
2aa7a84d91 comment out postgresql-14-postgis-3 for now 2022-02-07 17:04:37 +00:00
Ed Chalstrey
bb4ca6aca8 add yes flag 2022-02-07 16:16:04 +00:00
Ed Chalstrey
c6baedbca0 remove apt-get installs of things we don't need 2022-02-07 15:29:01 +00:00
Ed Chalstrey
9e7cc6e0c3 use COPY instead of git clone 2022-02-07 14:35:42 +00:00
Ed Chalstrey
36e28ced36 reorder installations and add WORKDIR selection 2022-02-07 14:24:34 +00:00
Ed Chalstrey
a9054c8ef0 add wait 2022-02-07 14:17:44 +00:00
Ed Chalstrey
e43a200ee6 bring compose in line with dockerfile 2022-02-07 14:16:36 +00:00
Ed Chalstrey
c5a583f2a2 choose npm start var names docker 2022-02-07 14:10:46 +00:00
Ed Chalstrey
e1a12c8008 rudimentary dockerfile 2022-02-07 14:05:30 +00:00
Ed Chalstrey
226c9a1a5f add etl files with specific db name 2022-02-07 13:45:55 +00:00
Ed Chalstrey
4139120f5a Docker starting material 2022-02-07 13:33:56 +00:00
Ed Chalstrey
5b5bcff855 add TILECACHE_PATH 2022-02-07 10:30:36 +00:00
Ed Chalstrey
b558b3042b add test polygons documentation 2022-02-03 15:26:10 +00:00
Ed Chalstrey
97caaa5f06 bump shapely version 2022-02-03 14:51:48 +00:00
Ed Chalstrey
df77db2854 bump osmnx version 2022-02-03 14:46:49 +00:00
Ed Chalstrey
f5818b5e28 consistent backticks 2022-02-03 11:18:21 +00:00
Ed Chalstrey
d7bcd6ed80 postgres 14 2022-02-03 11:15:04 +00:00
Ed Chalstrey
b7b2ca1e88 point to correct postgres repo 2022-02-03 10:51:04 +00:00
Ed Chalstrey
cf762f8c4b duplicate 463711317d2b97215af608456fbae76cd643b8a7 changes (memory) 2022-02-02 17:03:16 +00:00
Ed Chalstrey
95ea483bf4 use node 16 and latest npm 2022-02-02 16:58:29 +00:00
Ed Chalstrey
4eff84576f update vm_provision for vagrant to node16 2022-02-02 16:54:08 +00:00
Tom Russell
4e40b31bac Fix for compilation error
ERROR in src/frontend/route.tsx:36:25
TS2339: Property 'from' does not exist on type '{}'.
2022-02-02 15:06:57 +00:00
Tom Russell
593e3a1f26 Possibly-working npm module state 2022-02-02 15:06:16 +00:00
Mateusz Konieczny
598ab0fa2a Refine secondary construction materials title
requested in #727
2022-02-02 11:31:53 +01:00
Mateusz Konieczny
867c6312b0 Rename construction system
requested in #727
2022-02-02 11:26:06 +01:00
Mateusz Konieczny
ae39bc8066 Flip colors of wood and other natural material
requested in #727
2022-02-02 11:24:23 +01:00
Mateusz Konieczny
09b9a4f2ce
Merge pull request #771 from colouring-cities/feature/reword-local-asset
Feature/reword local asset
2022-02-01 17:06:12 +01:00
Mateusz Konieczny
19f358b890
Merge pull request #769 from colouring-cities/feature/hide-likes
hide likes
2022-02-01 17:05:18 +01:00
Mateusz Konieczny
3bf048fc28
Merge pull request #772 from colouring-cities/feature/better-section-description
Better describe Community section
2022-02-01 13:46:47 +01:00
Mateusz Konieczny
fdd600467b Change community_activities title
requested in #734
2022-02-01 12:47:16 +01:00
Mateusz Konieczny
aae71d76af Better describe section in Community
better describe section about community use
2022-02-01 12:43:28 +01:00
Mateusz Konieczny
032e02ebd2 Modify phrasing for locally significant building
third part of #734
2022-02-01 12:38:50 +01:00
Mateusz Konieczny
482678b44f Eliminate dead code 2022-02-01 12:33:11 +01:00
Mateusz Konieczny
db64f40708 Restore labels in the history menu 2022-01-31 17:59:10 +01:00
Mateusz Konieczny
ee16977b66 Hide prominent display of likes counts
it remains accessible from map (approximate values) and from history tag of given object
removal is motivated by desire to avoid misleading "0 people likes this building" - true about database state but not true about world in general
exact phrasing is also a bit problematic in general
2022-01-31 17:56:28 +01:00
Mateusz Konieczny
e8ff5df818
Merge pull request #711 from colouring-cities/feature/new-building-types
Feature/new building types
2022-01-18 18:35:12 +01:00
Mateusz Konieczny
2f77e278b2
Merge pull request #719 from colouring-cities/feature/make-contributors-less-confusing
Document contributors section to avoid confusion
2022-01-18 18:35:00 +01:00
Mateusz Konieczny
c30c3b6e1c Finish rename 2022-01-18 10:33:58 +01:00
Mateusz Konieczny
47fae3face
Merge pull request #716 from colouring-cities/all-contributors/add-matkoniecz
docs: add matkoniecz as a contributor for code, doc
2022-01-17 12:15:34 +01:00
Mateusz Konieczny
0e3666d2c8
Document contributors section to avoid confusion
https://github.com/colouring-cities/colouring-london/pull/715 was caused by not clarifying anywhere how this section works (and it was also reason why I never touched it)
2022-01-17 12:15:01 +01:00
Tom Russell
24e34ab302
Update contributors in README 2022-01-17 11:11:45 +00:00
Mateusz Konieczny
cc5b75554e
Merge branch 'master' into all-contributors/add-matkoniecz 2022-01-17 12:10:12 +01:00
Ed Chalstrey
1f5d6959a9
Merge pull request #718 from colouring-cities/all-contributors/add-edwardchalstrey1
docs: add edwardchalstrey1 as a contributor for code, doc
2022-01-17 10:57:51 +00:00
allcontributors[bot]
e156cfcd0b
docs: update .all-contributorsrc [skip ci] 2022-01-17 10:57:14 +00:00
allcontributors[bot]
07498fbe8c
docs: update README.md [skip ci] 2022-01-17 10:57:13 +00:00
Ed Chalstrey
bf22cf7224
Merge pull request #717 from colouring-cities/revert-715-test-branch
Revert "add edwardchalstrey1 to contributors"
2022-01-17 10:56:46 +00:00
Tom Russell
643af2bde1
Add Melda, Tarn, Louis to .all-contributorsrc 2022-01-17 10:54:22 +00:00
Ed Chalstrey
86f9bd5d37 Revert "add edwardchalstrey1 to contributors (#715)"
This reverts commit e9c839a2a1.
2022-01-17 10:51:08 +00:00