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

1108 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maciej Ziarkowski
f351c87756 Parse building ID in API controller 2020-01-02 12:39:24 +01:00
Maciej Ziarkowski
dbd6487b0b Add API helpers 2020-01-02 10:59:13 +00:00
Maciej Ziarkowski
0403655765
Merge pull request #534 from tomalrussell/fix/532-amend-welcome 
Update welcome page text
 2019-12-16 19:02:33 +01:00
Maciej Ziarkowski
465c8f7dbf
Update welcome page text 2019-12-16 18:54:12 +01:00
Martin-dJ
1f2256c721 Implementation of basic leaderboard 2019-12-16 13:26:13 +00:00
Dominic H
a03151af51 Migrations to enable the original landuse to be added to site 
- links to #500 
- addresses #363 
- addresses #491
 2019-12-13 16:24:39 +00:00
Maciej Ziarkowski
82a50d77d6 Allow specifying JSON columns for CSV bulk import 2019-12-10 17:25:55 +00:00
Maciej Ziarkowski
26ca7f8873 Accept CSV with building_id for API data import 2019-12-10 17:16:26 +00:00
Tom Russell
f577368df6
Merge pull request #530 from tomalrussell/fix/npm-update 
Update npm packages
 2019-12-10 12:14:36 +00:00
Tom Russell
5c1f6c0239 Update npm packages 2019-12-10 11:50:47 +00:00
Maciej Ziarkowski
6920a06b51 Rename migration files 2019-12-03 18:33:12 +00:00
Maciej Ziarkowski
3392c2411a
Merge pull request #527 from mz8i/feature/513-activate-land-use 
Feature/513 activate land use
 2019-12-03 19:31:10 +01:00
Maciej Ziarkowski
817b44515b Change Mixd Use order to capitalised 2019-12-03 18:19:50 +00:00
Maciej Ziarkowski
529ce96e42 Add current land use frontend (read-only) 2019-12-03 18:17:04 +00:00
Maciej Ziarkowski
5170dc7971 Improve land use processing backend 2019-12-03 17:30:51 +00:00
Maciej Ziarkowski
c3b5c51da7 Deep compare array fields 2019-12-03 17:29:08 +00:00
Maciej Ziarkowski
adb620fc77 Plug in domain logic processing into building API 2019-12-03 13:51:16 +00:00
Maciej Ziarkowski
3ea505359a Add land use classification API processing logic 2019-12-03 13:50:24 +00:00
Maciej Ziarkowski
b375c34ee3 Update migration comments 2019-12-03 13:39:18 +00:00
Maciej Ziarkowski
49a58e9716 Remove .DS_Store files 2019-12-02 21:02:09 +00:00
Maciej Ziarkowski
b41f9f555d Merge branch 'features/migrations_landuse' into feature/513-activate-land-use 2019-12-02 21:01:03 +00:00
Maciej Ziarkowski
8bbe63fee7 Add land use groups lookup, drop original land use 2019-12-02 20:58:50 +00:00
Maciej Ziarkowski
1dddf3a31e Turn on land use groups as used 2019-12-02 20:56:49 +00:00
Maciej Ziarkowski
aa3e1604e6 Merge branch 'features/migrations_landuse' of github.com:tomalrussell/colouring-london into features/migrations_landuse 2019-12-02 18:15:46 +00:00
Maciej Ziarkowski
bfdde02fab Merge branch 'feature/bulk_data_sources' into features/migrations_landuse 2019-12-02 18:13:55 +00:00
Maciej Ziarkowski
afe9d048f2 Make land use classification migration concise 2019-12-02 18:08:35 +00:00
Dominic H
7b8215517a Update to migrations for staging test 2019-12-02 15:57:22 +00:00
Maciej Ziarkowski
6a7c4f1270 Re-order land use legend 2019-12-02 15:19:44 +00:00
Maciej Ziarkowski
415a6872b7 Add legend for land use 2019-12-02 15:12:18 +00:00
Maciej Ziarkowski
51a2a3a1d8 Add tile layer and style for land use 2019-12-02 15:12:02 +00:00
Dominic H
863dbe7eef Adds bul source migrations for landuse in support of #358 2019-12-02 15:02:58 +00:00
Maciej Ziarkowski
76def0022f Fix errors in landuse migrations 2019-12-02 12:53:38 +00:00
Maciej Ziarkowski
ad69ef798e
Merge pull request #526 from mz8i/feature/500-age-source-update 
Update Age source options without 'Other website'
 2019-12-02 01:59:07 +01:00
Maciej Ziarkowski
2428b28eda Merge branch 'master' into feature/500-age-source-update 2019-12-02 00:12:55 +00:00
Maciej Ziarkowski
3d72fd9459 Update Age source options without 'Other website' 2019-12-02 00:01:43 +00:00
Dominic H
20e9299226 Work toward #358 
-link to 
https://github.com/colouring-london/colouring_london_analysis/blob/master/bulk_extracts/nlud_landuse_classification.sql
 2019-11-29 17:35:50 +00:00
Maciej Ziarkowski
572de62944
Merge pull request #523 from mz8i/fix/lat-lon-errors 
Fix/lat lon errors
 2019-11-28 13:41:30 +01:00
Maciej Ziarkowski
06dfae0113 Set bounds for numbers, increase lat/lon precision 2019-11-28 12:22:10 +00:00
Maciej Ziarkowski
c421ffbdb7 Merge branch 'develop' into fix/lat-lon-errors 2019-11-28 12:00:11 +00:00
Maciej Ziarkowski
56b1aafb98
Merge pull request #521 from mz8i/feature/517-prevent-copy-empty 
Feature 517: prevent copying empty values
 2019-11-27 14:01:33 +01:00
Maciej Ziarkowski
f96dcc85fb Prevent copying empty values 2019-11-26 12:09:27 +00:00
Maciej Ziarkowski
510f41b679
Merge pull request #519 from mz8i/feature/518-block-user 
Feature 518: block user
 2019-11-25 15:08:03 +01:00
Maciej Ziarkowski
7c863b41de Prevent selecting empty field for copy 2019-11-22 19:30:03 +00:00
Maciej Ziarkowski
31768a0860 Prevent blocked user from logging in 2019-11-22 18:13:13 +00:00
Maciej Ziarkowski
39ddd546f3 Add user blocking migrations 2019-11-22 18:12:48 +00:00
Maciej Ziarkowski
866e103a80 Handle nullish, not falsey values in numeric input 2019-11-22 16:03:36 +00:00
Tom Russell
f3b9be39bf Update load_csv python script 
- use building_id if present in CSV
- print DEBUG even if response from API is 200
- handle empty-string sust_dec (which fails because empty-string isn't a valid
  enum value as defined in 011.sustainability.up.sql) by deleting from data
  if present
 2019-11-21 13:17:17 +00:00
Maciej Ziarkowski
2ffa14cdbb Add info when no recent edit history to display 2019-11-18 14:18:19 +00:00
Maciej Ziarkowski
fe84016e79
Merge pull request #508 from mz8i/feature/499-global-edit-history 
Decrease simple edit history time to 1 week
 2019-11-18 12:36:29 +00:00
Maciej Ziarkowski
3b35331ead Decrease simple edit history time to 1 week 2019-11-18 11:21:02 +00:00