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

1666 Commits

Author SHA1 Message Date
Mike Simpson
0c3562e9fd Tweaks to Welcome Text 
As requested by Polly
#1116
 2023-04-12 22:04:36 +01:00
dependabot[bot]
7432dbf1ed
Bump follow-redirects from 1.14.7 to 1.15.2 in /app 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.15.2.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.15.2)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-12 20:23:09 +00:00
Mike Simpson
d0c9806775
Merge pull request #1125 from colouring-cities/dependabot/npm_and_yarn/app/webpack-5.76.0 
Bump webpack from 5.24.0 to 5.76.0 in /app
 2023-04-12 21:22:38 +01:00
Mike Simpson
0b9c8dbe2c
Merge pull request #1123 from colouring-cities/dependabot/npm_and_yarn/app/url-parse-1.5.10 
Bump url-parse from 1.5.4 to 1.5.10 in /app
 2023-04-12 21:22:26 +01:00
Mike Simpson
67d1442206
Merge branch 'colouring-cities:master' into master 2023-04-06 15:51:45 +01:00
Mike Simpson
90af39dfaf Update historic maps to show Survival Status 2023-04-06 15:22:15 +01:00
Mike Simpson
07cb6b4846 Add Survival Source 2023-04-06 15:21:59 +01:00
Mike Simpson
d92456cdae Big Fix for Survival Status on some buildings 2023-04-06 15:21:41 +01:00
Mike Simpson
8418b5f6c0 WIP - Survival Status data saving 
Activate Survival Status drop down box on Age and History category. Allow it to be set, saved and visualised.
 2023-04-05 15:13:48 +01:00
dependabot[bot]
a468cd12e2
Bump webpack from 5.24.0 to 5.76.0 in /app 
Bumps [webpack](https://github.com/webpack/webpack) from 5.24.0 to 5.76.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.24.0...v5.76.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-14 15:24:15 +00:00
dependabot[bot]
49eca09d51
Bump url-parse from 1.5.4 to 1.5.10 in /app 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.4 to 1.5.10.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.4...1.5.10)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:42:49 +00:00
dependabot[bot]
233c4ef277
Bump ansi-regex from 4.1.0 to 5.0.1 in /app 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 4.1.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v4.1.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:40:36 +00:00
Mike Simpson
b34b1bdae4
Merge pull request #1118 from colouring-cities/dependabot/npm_and_yarn/app/async-2.6.4 
Bump async from 2.6.3 to 2.6.4 in /app
 2023-03-10 16:39:36 +00:00
Mike Simpson
2892dae4bc
Merge pull request #1121 from colouring-cities/dependabot/npm_and_yarn/app/sharp-0.30.5 
Bump sharp from 0.28.3 to 0.30.5 in /app
 2023-03-10 16:39:28 +00:00
Mike Simpson
6fc902ae12
Merge pull request #1120 from colouring-cities/dependabot/npm_and_yarn/app/eventsource-1.1.2 
Bump eventsource from 1.1.0 to 1.1.2 in /app
 2023-03-10 16:39:14 +00:00
Mike Simpson
fa18db2882
Merge pull request #1119 from colouring-cities/dependabot/npm_and_yarn/app/terser-4.8.1 
Bump terser from 4.8.0 to 4.8.1 in /app
 2023-03-10 16:38:29 +00:00
dependabot[bot]
e9cf78d583
Bump sharp from 0.28.3 to 0.30.5 in /app 
Bumps [sharp](https://github.com/lovell/sharp) from 0.28.3 to 0.30.5.
- [Release notes](https://github.com/lovell/sharp/releases)
- [Changelog](https://github.com/lovell/sharp/blob/main/docs/changelog.md)
- [Commits](https://github.com/lovell/sharp/compare/v0.28.3...v0.30.5)

---
updated-dependencies:
- dependency-name: sharp
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:46 +00:00
dependabot[bot]
f8ff1bb63c
Bump eventsource from 1.1.0 to 1.1.2 in /app 
Bumps [eventsource](https://github.com/EventSource/eventsource) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/EventSource/eventsource/releases)
- [Changelog](https://github.com/EventSource/eventsource/blob/master/HISTORY.md)
- [Commits](https://github.com/EventSource/eventsource/compare/v1.1.0...v1.1.2)

---
updated-dependencies:
- dependency-name: eventsource
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:38 +00:00
dependabot[bot]
aca897cfe5
Bump terser from 4.8.0 to 4.8.1 in /app 
Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:32 +00:00
dependabot[bot]
2283bbb96a
Bump async from 2.6.3 to 2.6.4 in /app 
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-10 16:34:28 +00:00
Mike Simpson
7aa106624d
Merge pull request #1108 from colouring-cities/dependabot/npm_and_yarn/app/json5-1.0.2 
Bump json5 from 1.0.1 to 1.0.2 in /app
 2023-03-10 16:33:59 +00:00
Mike Simpson
75dc274251
Merge pull request #1109 from colouring-cities/dependabot/npm_and_yarn/app/qs-and-body-parser-and-express-6.11.0 
Bump qs, body-parser and express in /app
 2023-03-10 16:33:49 +00:00
Mike Simpson
484a0f0c82
Merge pull request #1110 from colouring-cities/dependabot/npm_and_yarn/app/decode-uri-component-0.2.2 
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app
 2023-03-10 16:33:44 +00:00
Mike Simpson
a9b70788da
Merge pull request #1111 from colouring-cities/dependabot/npm_and_yarn/app/loader-utils-1.4.2 
Bump loader-utils from 1.4.0 to 1.4.2 in /app
 2023-03-10 16:33:37 +00:00
Mike Simpson
ec7a515e8b
Merge pull request #1113 from colouring-cities/dependabot/npm_and_yarn/app/minimist-1.2.8 
Bump minimist from 1.2.5 to 1.2.8 in /app
 2023-03-10 16:33:32 +00:00
traveller195
4dcd3de93a
change data definiton for tile mapstyle of 'location' and 'team' 
using Subquery/ nested SQL Qquery to only load those buildings, having at least a few collected data. The benefit is, that the mapstyle is not different for nodata buildings comparing different data categories. Now, if you compare nodata buildings in 'team' or 'location' with others, the stroke width is larger than the normal map style... loading only builidings with data avoids this problem of different map styles. It is a better and more performant solution than changing it in polygon.xml
see also c80f243c0d
 2023-03-08 15:30:39 +01:00
dependabot[bot]
52f06fe896
Bump minimist from 1.2.5 to 1.2.8 in /app 
Bumps [minimist](https://github.com/minimistjs/minimist) from 1.2.5 to 1.2.8.
- [Release notes](https://github.com/minimistjs/minimist/releases)
- [Changelog](https://github.com/minimistjs/minimist/blob/main/CHANGELOG.md)
- [Commits](https://github.com/minimistjs/minimist/compare/v1.2.5...v1.2.8)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-04 02:50:10 +00:00
dependabot[bot]
507a61faf3
Bump loader-utils from 1.4.0 to 1.4.2 in /app 
Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](https://github.com/webpack/loader-utils/compare/v1.4.0...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 11:56:00 +00:00
dependabot[bot]
30a16632ba
Bump qs, body-parser and express in /app 
Bumps [qs](https://github.com/ljharb/qs) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [body-parser](https://github.com/expressjs/body-parser) and [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `qs` from 6.9.6 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.9.6...v6.11.0)

Updates `body-parser` from 1.19.1 to 1.20.1
- [Release notes](https://github.com/expressjs/body-parser/releases)
- [Changelog](https://github.com/expressjs/body-parser/blob/master/HISTORY.md)
- [Commits](https://github.com/expressjs/body-parser/compare/1.19.1...1.20.1)

Updates `express` from 4.17.2 to 4.18.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
- dependency-name: body-parser
  dependency-type: direct:production
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 11:55:59 +00:00
dependabot[bot]
e8ffd5ef3c
Bump decode-uri-component from 0.2.0 to 0.2.2 in /app 
Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2.
- [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases)
- [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2)

---
updated-dependencies:
- dependency-name: decode-uri-component
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 11:55:59 +00:00
dependabot[bot]
5e42236ee2
Bump json5 from 1.0.1 to 1.0.2 in /app 
Bumps [json5](https://github.com/json5/json5) from 1.0.1 to 1.0.2.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v1.0.1...v1.0.2)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-28 11:55:46 +00:00
Mike Simpson
2f21ef0020
Merge pull request #1098 from colouring-cities/tweaks/ui 
Rename Size and Form Category
 2023-02-24 09:45:33 +00:00
Mike Simpson
42578c0686 Rename Size and Form Category 2023-02-17 15:13:53 +00:00
Mateusz Konieczny
b19ada700b fix typo: maybe rented -> may be rented 
fixes #1078
 2023-02-17 10:21:48 +01:00
Mike Simpson
4c4cfdc145 Merge remote-tracking branch 'upstream/master' 2023-02-15 16:53:07 +00:00
Mateusz Konieczny
fa9e81d281 Button style unification for user-survey questions 2023-02-15 17:14:51 +01:00
Mike Simpson
fc2cc07a1c
Merge pull request #1089 from colouring-cities/colouring-core-fixes 
Colouring core fixes
 2023-02-15 15:55:32 +00:00
Mike Simpson
4a0e65f8c4
Merge pull request #1081 from matkoniecz/feature/core-18-domestic-likes 
Rework likes and upgrades to community section, ask is building domestic, deduplicate landuse section
 2023-02-15 09:14:02 +00:00
Mateusz Konieczny
d0cd948991 tweak labels as requested 2023-02-15 09:46:08 +01:00
Mateusz Konieczny
58e5e359a9 fix font colour of inline map buttons 2023-02-15 08:25:33 +01:00
Mateusz Konieczny
0f62cad9db buttons always have enabled/disabled state 
fixes #1085
 2023-02-15 08:25:06 +01:00
Mateusz Konieczny
741df74c7f local significance/interest labels 2023-02-15 07:44:35 +01:00
Mateusz Konieczny
7c8834947e tweak button text 2023-02-15 07:44:08 +01:00
Mateusz Konieczny
62fbd4378e drop dead code 2023-02-15 07:43:46 +01:00
Mike Simpson
2681b4b5e5
Merge pull request #1082 from matkoniecz/feature/allow-multiline-in-section-headers 
make data entry group work with long titles
 2023-02-14 14:04:30 +00:00
Mike Simpson
db76a30ec5 Update GitHub URLs 2023-02-14 13:23:35 +00:00
Mateusz Konieczny
f3bc1c9e58 unify labels 
previously other had year, this had date despite asking for a year
 2023-02-14 13:06:48 +01:00
Mateusz Konieczny
5edf6d4b1f remove no longer needed code 2023-02-09 22:56:37 +01:00
Mateusz Konieczny
7d9580ae17 new more descriptive map buttons 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
18023e786a remove switcher for a primary map style 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
86d60058e1 add horizontal lines splitting different sections 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
e4500ba025 change instruction as instructed 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
cd92cb7ed7 shorten header descriptions 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
04d09c1f39 tweak question as requested 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
8603940964 rearrange section structure in Community 
no reintended for now to keep things nicely mergable/diffable
 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
8894fc167c tweak the tile as requested 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
c74d358c33 remove 'is domestic' question form community and hide liking individual buildings 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
aab44869f8 fix button code 2023-02-09 22:54:18 +01:00
Mateusz Konieczny
fe87fa62e6 make data entry group work with long titles 
may have some unexpected side-effects but testing has not revealed any
 2023-02-09 22:49:47 +01:00
Mike Simpson
dd17436a53
Update cc-config.json 2023-02-09 11:24:27 +00:00
Mike Simpson
6bc16e5e2d Colouring London Config Settings 2023-02-09 11:23:35 +00:00
Mike Simpson
cd6cfb1130 Generify Config Data for new Colouring Core Branch 2023-02-09 10:47:17 +00:00
Mike Simpson
d63da083e0 Add Project-specific Privacy Policy Info to Config 2023-02-08 12:04:33 +00:00
Mike Simpson
47deb9b12a Correct GitHub URL 2023-02-08 10:58:24 +00:00
Mike Simpson
3c0157d0ea Merge branch 'master' into colouring-core 2023-02-08 10:54:04 +00:00
Mateusz Konieczny
fec74c4a84 prevent duplication in landuse code 2023-02-08 10:28:58 +01:00
Mateusz Konieczny
8f7eb6bf81 use more clear naming variant 2023-02-07 13:09:16 +01:00
Mateusz Konieczny
83847d75b9 fix typology likes detection 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
037eced6f1 fix whitespace 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
26a330f743 likes typology display 2023-02-07 12:28:17 +01:00
Mateusz Konieczny
5431f8528e better buttons on the map in community section 
enable map button for domestic status
show like button when relevant
 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
cee0c16edf add new map style for domestic status 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
df07a3bf1d add work from home explanation 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
e3e9e83632 allow mixed answer for domestic use 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
621a5b67db tweak questions and add new ones on what is worth keeping 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
4b4fe20281 use yes only interface for worth keeping ones 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
2356548aad rename question 
per https://github.com/colouring-cities/colouring-core/issues/18#issuecomment-1413641393
 2023-02-07 11:42:05 +01:00
Mateusz Konieczny
ae0e0bb2b6 Add question whether building is domestic. 2023-02-07 11:42:01 +01:00
Mateusz Konieczny
5bde854045 remove box about a new feature 2023-02-07 10:32:31 +01:00
Mike Simpson
7aebd77f10 Merge branch 'master' into colouring-core 2023-02-03 11:28:45 +00:00
Mike Simpson
6dd356bbeb
Merge pull request #1076 from matkoniecz/fix/1065-move-the 
exclude the from the link
 2023-02-03 10:59:26 +00:00
Mike Simpson
43b9c650a7 Additional Tweak 
See #1074
 2023-02-03 10:55:22 +00:00
Mateusz Konieczny
372873b97a exclude the from the link 
apply https://github.com/colouring-cities/colouring-london/issues/1065#issuecomment-1413639850
 2023-02-02 15:17:05 +01:00
Mike Simpson
a43c0593fe Various tweaks requested by Polly 
Changes to subcategories, wording and typo fixes discussed in a meeting with Polly on 02/02. #1074
 2023-02-02 13:02:05 +00:00
Mike Simpson
3c3ffc76b5
Merge pull request #1072 from matkoniecz/feature/1071-more-ca-info 
Provide more instruction for user when editing CA and fix review button
 2023-02-02 12:30:14 +00:00
Mike Simpson
994d9de0ac
Merge pull request #1070 from matkoniecz/fix/again 
Group of changes based on feedback from meeting preparations
 2023-02-02 12:29:22 +00:00
Mateusz Konieczny
1499534f9e provide requested disclaimer 
fixes #1065
 2023-02-02 13:10:02 +01:00
Mateusz Konieczny
24818a83ec More instruction about CA, fix the review button 
fixes #1071
 2023-02-02 08:08:41 +01:00
Mateusz Konieczny
b8349a391c be less optimistic 2023-01-24 12:00:08 +01:00
Mateusz Konieczny
cec81583ac new colouring for Withdrawn 2023-01-24 10:56:09 +01:00
Mateusz Konieczny
418b03ada1 new Withdrawn styling 2023-01-24 10:43:21 +01:00
Mateusz Konieczny
ad51f3433e new wording for active application info 2023-01-24 10:35:46 +01:00
Mateusz Konieczny
4a61f19103 Revert "unroll layer option on using buttons" 
This reverts commit 5a59815234.
 2023-01-24 10:35:41 +01:00
Mateusz Konieczny
5a59815234 unroll layer option on using buttons 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
e7d3bdc784 mention where more specific sources are 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
63e22f46b6 add one more link to datahub 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
9868a700f8 rewrite explanation info for current applications 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
8c9f62b51e mention CA short name 2023-01-23 14:44:37 +01:00
Mateusz Konieczny
f262aedb89 better coloring for formerly pink buttons 
fixes #1064
 2023-01-23 14:44:37 +01:00
Mike Simpson
9c1e22663e
Merge pull request #1066 from matkoniecz/fix/assorted-fixes 
assorted fixes
 2023-01-23 11:21:59 +00:00