Commit Graph

987 Commits

Author SHA1 Message Date
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
Maciej Ziarkowski
568bc70315
Correct path to file in adding-new-fields doc 2020-03-19 12:29:41 +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
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
Maciej Ziarkowski
eccf0f5b04
Merge pull request #581 from mz8i/fix/541-transport-color
Change transport color
2020-02-16 20:53:25 +01:00
Maciej Ziarkowski
d4d8d710f9 Change transport color 2020-02-16 19:49:04 +00:00
dom_ucl_mb
5ca6a6f7fe WIP for #405 2020-02-13 17:22:16 +00:00
Maciej Ziarkowski
f68343f03e Merge branch 'develop' 2020-02-09 18:11:22 +00:00
Maciej Ziarkowski
5431cbc70f
Merge pull request #562 from mz8i/feature/history-paging
Feature: edit history paging
2020-02-09 19:09:42 +01:00
Maciej Ziarkowski
f9a7570c76
Merge pull request #572 from mz8i/fix/height-scale
Fix colour scale for height to apex
2020-02-07 19:49:36 +01:00
Maciej Ziarkowski
7f4086f5ad Fix colour scale for height to apex 2020-02-07 16:07:18 +00:00
Maciej Ziarkowski
0c9177d4fe Add OpenAPI doc for extracts and history 2020-02-07 14:21:18 +00:00
Maciej Ziarkowski
4719dea2d4 Update edit history frontend 2020-02-03 12:40:36 +00:00
Maciej Ziarkowski
aa43ab7711 Merge branch 'develop' into feature/history-paging 2020-02-02 16:40:17 +00:00
Maciej Ziarkowski
c4e93d1a65
Merge pull request #560 from mz8i/feature/remove-proptype-gen
Remove prop types generation, babel from build
2020-02-02 16:38:48 +00:00
Maciej Ziarkowski
e3be0a2869 Remove prop types generation, babel from build 2020-01-31 18:34:27 +00:00
Maciej Ziarkowski
fac4c8b35b Split errors into api and general 2020-01-31 18:02:24 +00:00
Maciej Ziarkowski
72cc7e62d2 Add param parsing to edit history controller 2020-01-31 15:45:12 +00:00
Maciej Ziarkowski
753c84acb7 Update edit history tests and implementation 2020-01-31 15:39:47 +00:00
Maciej Ziarkowski
908f3181e6 Remove babel loader from build pipeline 2020-01-31 15:36:37 +00:00
Maciej Ziarkowski
928eed6671 Clarify param parser handling positive integers 2020-01-31 15:35:34 +00:00
Maciej Ziarkowski
297f7ccf5f Update edit history service tests and implementation 2020-01-30 18:23:59 +00:00
Maciej Ziarkowski
60d087c424 Fix mock edit history data access 2020-01-30 15:27:48 +00:00
Maciej Ziarkowski
2d4682685b Fix edit history data access queries/usage 2020-01-29 17:24:44 +00:00
Maciej Ziarkowski
899e450eda Add missing API error class exports/imports 2020-01-29 17:24:04 +00:00
Maciej Ziarkowski
92ff5d7172 Add API error classes, parameter parsing functions 2020-01-29 15:59:44 +00:00
Maciej Ziarkowski
4ff64cda79 Rework edit history service, add unit tests 2020-01-27 01:08:32 +00:00
Maciej Ziarkowski
e682cfa074 Add edit history data access mock 2020-01-27 01:06:58 +00:00
Maciej Ziarkowski
196c7b7873 Add sorting helpers 2020-01-27 01:01:18 +00:00