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

1104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tom Russell
695bd6c936
Merge pull request #509 from colouring-london/fix/upload 
Update load_csv python script
 2020-04-09 10:19:32 +01:00
Tom Russell
055ed426b4
Merge branch 'master' into fix/upload 2020-04-09 10:19:13 +01:00
MeldaS
32bfb490be Modify files for adding colouring map attribute 2020-04-01 12:18:44 +01:00
MeldaS
e503ee4dcc Modify files for adding construction attributes 2020-04-01 12:18:19 +01:00
MeldaS
315c028c6a Create SQL scipts for construction category 2020-04-01 12:15:59 +01:00
Maciej Ziarkowski
7b09fe6f84 Update land use hints 2020-03-27 15:23:57 +00:00
Maciej Ziarkowski
a5f29c6aad Improve multi entry + autofill UI 2020-03-27 14:32:19 +00:00
Maciej Ziarkowski
c3f757734a Make land use legend more concise 2020-03-24 00:16:37 +00:00
Maciej Ziarkowski
853c558b37 Add land use hints 2020-03-23 23:33:03 +00:00
Maciej Ziarkowski
87f16398f2 Parse markdown links in tooltip text 2020-03-23 23:32:10 +00:00
Maciej Ziarkowski
559971c6da Improve tooltip show/hide 2020-03-23 23:31:33 +00:00
Maciej Ziarkowski
d6beb03065 Verify correct land use group parameters 2020-03-22 19:18:07 +00:00
Maciej Ziarkowski
aebf7c7135 Improve errors and data access for building update 2020-03-22 19:03:05 +00:00
Maciej Ziarkowski
786389a50b Fix land use group autofill 2020-03-20 01:05:23 +00:00
Maciej Ziarkowski
bbd570ddbe Clean up land use order map/legend 2020-03-20 01:05:06 +00:00
Maciej Ziarkowski
f6b71c7fc7 Improve land use group autofill 2020-03-19 18:17:56 +00:00
Maciej Ziarkowski
c35f545540 Remove current landuse class from data extract 2020-03-19 14:42:01 +00:00
Maciej Ziarkowski
ff027cb64b Remove current land use class from frontend 2020-03-19 14:41:44 +00:00
Maciej Ziarkowski
914d7e56d4 Rewrite landuse domain logic without landuse class 2020-03-19 13:45:35 +00:00
Maciej Ziarkowski
568bc70315
Correct path to file in adding-new-fields doc 2020-03-19 12:29:41 +00:00
Maciej Ziarkowski
4bda0f0aa6 Add unfinished land use class,group,order impl 2020-03-17 16:29:59 +00:00
Maciej Ziarkowski
bb30aa7098 Include test files in tsconfig for intellisense 2020-03-08 18:46:28 +00:00
Maciej Ziarkowski
af64c4ca58 Merge branch 'develop' into feature/513-activate-land-use 2020-03-08 16:05:55 +00:00
Maciej Ziarkowski
9826ba784c Point tsconfig to client and server TS files only 
Previous config defined a glob for all TS files. But only the files
required from the client or server root files need to be transpiled.
This prevents the whole project build failinig due to one corrupt source
file that might not be committed to the repository, and isn't actually
used anywhere.
 2020-03-08 15:08:26 +00:00
Maciej Ziarkowski
4c7edee271 Update Age colours to latest style 2020-03-06 14:12:23 +00:00
dominijk
b84bf4801d WIP for #361 intial construction db elements 
- Materials list from #539
- Adding roof form for #584
 2020-02-27 18:30:52 +00:00
dominijk
6dfc82a397 Ready for staging, tested on local for #405 2020-02-27 16:19:52 +00:00
dominic
bdd3462e99
Update load_csv_to_staging.py 
Updates to bring staging script into line with main upload script
- Script was not working
 2020-02-27 12:04:09 +00:00