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

2543 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Simpson
8b8c92afc3 Remove unnecessary(?) duplicate code 
The code for the entire category is duplicated here. I did a side by side comparison, but could see no difference between the code in either part of the if statement, so I have removed one copy and tidied up the other.

#1155
 2023-06-23 10:31:32 +01:00
Mike Simpson
07a9ef0098
Merge pull request #1185 from matkoniecz/fix/updated-linked-reference 
Fix/updated linked reference
 2023-06-22 12:02:38 +01:00
Mateusz Konieczny
98ae8aa2f0 [doc] replace image of text with text, update it 2023-06-22 12:31:47 +02:00
Mateusz Konieczny
16f95ec6ec [doc] provide a link to referenced file 2023-06-22 12:30:33 +02:00
Mike Simpson
7bf1e7f0cd
Merge pull request #1160 from colouring-cities/dependabot/pip/maintenance/requests-2.31.0 
Bump requests from 2.24.0 to 2.31.0 in /maintenance
 2023-06-06 17:19:13 +01:00
Mike Simpson
12c3f380c6
Merge pull request #1161 from colouring-cities/dependabot/pip/etl/planning_data/requests-2.31.0 
Bump requests from 2.27.1 to 2.31.0 in /etl/planning_data
 2023-06-06 17:19:03 +01:00
Mike Simpson
b85e8dd5a4
Merge pull request #1159 from colouring-cities/dependabot/pip/etl/requests-2.31.0 
Bump requests from 2.23.0 to 2.31.0 in /etl
 2023-06-06 17:18:51 +01:00
Mike Simpson
6edd9b06bf
Merge pull request #1180 from colouring-cities/feature/ui-refactor 
Feature/UI refactor
 2023-06-06 17:16:44 +01:00
Mike Simpson
9d4ae91be4
Merge pull request #1162 from matkoniecz/fix/documentation_links 
fix colouring core rename regression in doc links
 2023-06-06 17:13:59 +01:00
Mike Simpson
e72d496e41 Fix categories menu resizing from Welcome to Category pages 2023-06-06 15:41:08 +01:00
Mike Simpson
0a38a3ec23 Revert for now 2023-06-06 15:03:22 +01:00
Mike Simpson
435d0cb2f3 Fix Key change buttons 2023-06-06 14:48:15 +01:00
Mike Simpson
2da2834a72 Fix historical maps (age and history) 
Will now change key when switching between historical maps and default view (building age)
 2023-06-06 13:54:42 +01:00
Mike Simpson
40285bef32 Remove unused code 2023-06-06 13:54:06 +01:00
Mike Simpson
355b1078c2 Fix Residential button toggle 2023-06-06 13:25:36 +01:00
Mike Simpson
afd4149021 Tweak Key text 2023-06-06 12:09:51 +01:00
Mike Simpson
d2c4c21280 Tweak data label 2023-06-06 12:09:41 +01:00
Mike Simpson
b6fad2774f Rename Subcategory 2023-06-06 12:08:59 +01:00
Mike Simpson
c8694ba0f5 Tweak logo to match new category layout 2023-05-31 21:37:02 +01:00
Mike Simpson
7b024ebb5c Activate fields on Age & History 
See issue #1169
 2023-05-31 21:36:53 +01:00
Mike Simpson
d40410e0fa Add new fields to export_attributes.sql 2023-05-31 21:09:01 +01:00
Mike Simpson
439e415c6e Changes for #1165 2023-05-31 21:05:02 +01:00
Mike Simpson
79918c7b9f OK, *this* is where the horizontal line is supposed to go! 
Moved it so it is always visible, not just when you are editing
 2023-05-31 12:53:18 +01:00
Mike Simpson
5efce50d4d Remove extraneous horizontal line 
Added because it wasn't displaying, but it appears to have fixed itself *facepalm*
 2023-05-31 12:18:34 +01:00
Mike Simpson
44ab9377dd Re-add missing horizontal line 2023-05-26 14:34:36 +01:00
Mike Simpson
e7b6b80938 Merge branch 'master' into feature/ui-refactor 2023-05-26 14:07:29 +01:00
Mike Simpson
9957118684
Merge pull request #1166 from matkoniecz/fix/1143-cache 
Fix revision not being passed
 2023-05-25 12:13:05 +01:00
Mateusz Konieczny
d5f0681e20 pass revisionId as needed 2023-05-25 13:08:03 +02:00
Mike Simpson
31c1c382f3 Remove Unused Retrofit fields 2023-05-24 15:43:15 +01:00
Mike Simpson
8487ce3afe Other Category Updates 
- Consistent Construction Date between Age and Team categories
- Disable unused Verify buttons
- Add missing Verify buttons
- Add tooltips to Disaster section
- Add new fields to database
 2023-05-24 14:53:14 +01:00
Mateusz Konieczny
108e1ed587 fix colouring core rename regression in doc links 2023-05-24 12:31:22 +02:00
Mike Simpson
19c906fcc5 Size / Age & History Sources 
Adding source link(s) field to activated data sources in the Size category and the Age & History category
 2023-05-23 21:27:45 +01:00
Mike Simpson
4c32710358 Add "Common Source Types" list 
- This will be the default source type for all fields, unless they need custom data. Then we can manage and edit this list in multiple places
- Use in Location and Land Use pages
 2023-05-23 15:13:23 +01:00
dependabot[bot]
e62be0b63f
Bump requests from 2.27.1 to 2.31.0 in /etl/planning_data 
Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-23 04:08:52 +00:00
dependabot[bot]
a32339b7f5
Bump requests from 2.24.0 to 2.31.0 in /maintenance 
Bumps [requests](https://github.com/psf/requests) from 2.24.0 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.24.0...v2.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-22 23:56:21 +00:00
dependabot[bot]
854fd46520
Bump requests from 2.23.0 to 2.31.0 in /etl 
Bumps [requests](https://github.com/psf/requests) from 2.23.0 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.23.0...v2.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-22 23:31:22 +00:00
Mike Simpson
4e348e7b54 Location + Land Use Sources 
- Add sources to multiple fields on Location + Land Use Categories
- Use data-fields-config properly instead of hard-coding some values
 2023-05-19 11:55:32 +01:00
Mike Simpson
715cdfaa02 More tweaks, mainly for consistency 2023-05-18 21:06:27 +01:00
Mike Simpson
79dec38f9f Add placeholder for Solar Panels data 2023-05-18 21:06:03 +01:00
Mike Simpson
38d53f26c8 Sidebar Tweaks 
Add horizontal line at bottom
Change style of horizontal likes in menu
Remove minimum height (now all subcategories are closed by default)
 2023-05-18 11:31:37 +01:00
Mike Simpson
6398426254 Change red layer buttons to blue 2023-05-18 11:16:18 +01:00
Mike Simpson
2ae1ff4d9a Adjust <hr> spacing 
Less space at the top (under save edits button)
More space when used as a divider in the main menu
 2023-05-18 10:12:57 +01:00
Mike Simpson
13cd09c727 Consistent capitalisation on sub-categories/labels 2023-05-17 15:46:48 +01:00
Mike Simpson
fdecc457c4 Fix for text scrolling behind the "save edits" box 2023-05-17 15:34:32 +01:00
Mike Simpson
71d21fb616 Fix bug where "save edits" box gets drawn over category title box 2023-05-17 15:31:43 +01:00
Mike Simpson
a26b4f8d86 Run "npx browserslist@latest --update-db" 
It's been nagging us to do this for ages!
 2023-05-16 17:37:30 +01:00
Mike Simpson
3332395351 Update URLs and Slugs to match category titles 2023-05-16 17:36:13 +01:00
Mike Simpson
5297f153e1 Rename files to match category titles 2023-05-16 17:16:20 +01:00
Mike Simpson
d14dea3d1a More UI Tweaks 
Mainly to improve consistency and readability across all categories/pages
Discussed in meeting with Polly 16/05
 2023-05-16 17:08:21 +01:00
Mike Simpson
f43e5f60fe WIP Various tweaks to category pages 
As discussed with Polly on 09/05/2023
 2023-05-12 16:43:20 +01:00