a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,082 Commits 3 Branches 0 Tags 30 MiB
fef3a6532c
Commit Graph

1082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maciej Ziarkowski
fef3a6532c Merge branch 'master' of github.com:tomalrussell/colouring-london 2020-06-18 13:00:53 +01:00
Maciej Ziarkowski
da52fa4971 Fix typo in etl requirements.txt 2020-06-18 13:00:39 +01:00
Tom Russell
c8e6953c85 Text change in current use box 2020-06-18 12:39:30 +01:00
Tom Russell
e6e0f790f1 Fix land use styles 
Add vacant/derelict and agriculture/fisheries
Fix transport green
 2020-06-18 12:28:11 +01:00
Tom Russell
d1aaf2ccbb Add babel-runtime explicitly to deps 
Was failing to build with:

Cannot find module 'babel-runtime/helpers/extends'
Require stack:
- /app/node_modules/react-leaflet-universal/dist/decorator.js
- /app/node_modules/react-leaflet-universal/dist/index.js
- /app/build/server.js
    at Function.Module._resolveFilename (internal/modules/cjs/loader.js:966:15)
    at Function.Module._load (internal/modules/cjs/loader.js:842:27)
    at Module.require (internal/modules/cjs/loader.js:1026:19)
    at require (internal/modules/cjs/helpers.js:72:18)
    at Object.<anonymous> (/home/tom/projects/colouring-london/colouring-london/app/node_modules/react-leaflet-universal/dist/decorator.js:7:17)
    at Module._compile (internal/modules/cjs/loader.js:1138:30)
    at Object.Module._extensions..js (internal/modules/cjs/loader.js:1158:10)
    at Module.load (internal/modules/cjs/loader.js:986:32)
    at Function.Module._load (internal/modules/cjs/loader.js:879:14)
    at Module.require (internal/modules/cjs/loader.js:1026:19)
 2020-06-18 11:39:02 +01:00
Tom Russell
1731969f87 Bump node packages 2020-06-18 11:10:10 +01:00
Tom Russell
5031c3bd66 Bump node to 12.18.1 2020-06-18 11:09:51 +01:00
Tom Russell
e956fa1cbf Ignore VS Code settings 2020-06-18 10:33:09 +01:00
Tom Russell
150ef00ca9 Update etl/migrations docs with a little more on prerequisites 2020-06-18 10:32:35 +01:00
Tom Russell
4eb5961af5 Fix use of osmnx to work with v0.14 2020-06-18 10:31:34 +01:00
Maciej Ziarkowski
c997654545 Add debug, no overwrite flags 2020-06-16 16:16:46 +01:00
Maciej Ziarkowski
e2b94cfe2e Move to argparse for command line options 2020-06-16 13:27:08 +01:00
Maciej Ziarkowski
cd74ff6f32 Add retrying logic 2020-06-16 13:24:43 +01:00
Tom Russell
210f57f6fa Add link to new content page 2020-05-14 17:24:34 +01:00
Tom Russell
57a43176d6
Merge pull request #564 from colouring-london/feature/menu-sidebar 
Feature: menu sidebar
 2020-05-04 17:52:15 +01:00
Tom Russell
ebe1e3f264 Disable secondary materials for now 2020-05-04 14:24:53 +01:00
Tom Russell
d1c42a40a6 Rename construction migration to 017, fix tile definition 
Note that enum types need to be cast to ::text for mapnik
rules to work as expected.
 2020-04-17 17:01:21 +01:00
Tom Russell
c20ea2bbb0 Knock out showcase link, fix leaderboard 2020-04-09 16:58:59 +01:00
Tom Russell
c4ffdf4db9 Tidy up initial basic leaderboard 2020-04-09 16:52:41 +01:00
Tom Russell
a2393a019a Tweak welcome text 2020-04-09 16:10:07 +01:00
Tom Russell
f4d18f7bda Move welcome float to sidebar 2020-04-09 15:57:17 +01:00
Tom Russell
3649f92d4c Fix compile errors by casting variables pulled from query strings 2020-04-09 15:44:11 +01:00
Tom Russell
3c2ecbd76e Fix showing maps for likes 2020-04-09 15:23:50 +01:00
Tom Russell
8dc4a387a8 Set razzle to use eslint, drop tslint.json 2020-04-09 15:09:34 +01:00
Tom Russell
ab3f0c4ce2 Move linting to use eslint (drop deprecated tslint) 2020-04-09 14:32:58 +01:00
Tom Russell
fa527f0f95 Bump npm packages 2020-04-09 14:08:18 +01:00
Tom Russell
b901e392bb
Merge branch 'master' into feature/menu-sidebar 2020-04-09 13:30:03 +01:00
Tom Russell
0f450d994a
Merge pull request #592 from colouring-london/develop 
Land-use and planning work
 2020-04-09 13:26:45 +01:00
Tom Russell
97953db742
Merge branch 'master' into develop 2020-04-09 13:26:36 +01:00
Tom Russell
218155ccdd
Merge pull request #573 from mz8i/feature/538-planning-update 
Feature 538: planning update
 2020-04-09 13:22:15 +01:00
Tom Russell
2696820ff5
Merge pull request #586 from colouring-london/feature/568-activate-construction 
Feature/568 activate construction
 2020-04-09 11:28:20 +01:00
Tom Russell
773bb993ea
Merge pull request #546 from mz8i/feature/513-activate-land-use 
Feature 513: activate land use - make editable [WIP]
 2020-04-09 11:15:24 +01:00
Tom Russell
bb73419caa
Merge pull request #591 from colouring-london/develop 
Point tsconfig to client and server TS files only
 2020-04-09 10:52:54 +01:00
Tom Russell
250c37ed75
Merge pull request #590 from colouring-london/feature/migrations_construction 
WIP for #361 intial construction db elements
 2020-04-09 10:51:34 +01:00
Tom Russell
22ae58a244
Merge pull request #589 from colouring-london/features/migrations_sustainability 
Features/migrations sustainability
 2020-04-09 10:48:04 +01:00
Tom Russell
5d8a0dd42b
Merge branch 'master' into features/migrations_sustainability 2020-04-09 10:47:55 +01:00
Tom Russell
ee64c301cd
Merge pull request #588 from colouring-london/feature/migrations_type_extend 
Migrations to enable the original landuse to be added to site
 2020-04-09 10:43:30 +01:00
Tom Russell
0dea779f68
Merge pull request #587 from colouring-london/features/migrations_community 
Initial cut of community fields
 2020-04-09 10:39:21 +01:00
Tom Russell
e19cb84f8f
Merge pull request #557 from colouring-london/dominic-patch-1 
Testing and addition db changes
 2020-04-09 10:35:03 +01:00
Tom Russell
e17419e017
Merge branch 'master' into dominic-patch-1 2020-04-09 10:34:56 +01:00
Tom Russell
b782f36230
Merge pull request #535 from colouring-london/feature/initial_leaderboard 
Implementation of basic leaderboard
 2020-04-09 10:33:23 +01:00
Tom Russell
58cd5a2070
Merge pull request #408 from colouring-london/features/migrations_team 
Features/migrations team
 2020-04-09 10:32:29 +01:00
Tom Russell
33c93430b5 Ignore DS_Store 2020-04-09 10:32:09 +01:00
Dominic H
eb368c7d1d Housekeeping 2020-04-09 10:28:45 +01:00
dominic
076742adf8 Switching to josnb object for #362 2020-04-09 10:28:45 +01:00
dominic
96aee71a4d Typo corrections for #362 2020-04-09 10:28:45 +01:00
dominic
3d687c48ba All fields required for launch as #362 
- Tested on local db copy
- Enables #407
 2020-04-09 10:28:45 +01:00
dominic
3246bf3dd5 Rename for #362 2020-04-09 10:27:35 +01:00
Dominic H
b0df644c2c Stashing WIP for #362 
- Complete fields list
- Completed cat down file
- Draft cat up file
 2020-04-09 10:27:35 +01:00
Dominic H
881f8512de WIP for #362 2020-04-09 10:27:35 +01:00