Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update live site for user comment fix and otehr locale updates #241

Merged
merged 9 commits into from
Nov 1, 2023
Merged

Update live site for user comment fix and otehr locale updates #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
aa1b7a2
Add max_changeset_comment config
Oct 28, 2023
56cd373
Add missing key and values in settings.yaml
Oct 29, 2023
ebb4d8a
Update ohm web for inspector fix
danrademacher Oct 30, 2023
decf1ae
Merge pull request #238 from OpenHistoricalMap/inspectorfix-Iss627
danrademacher Oct 31, 2023
55e7dd8
Locale updates
danrademacher Oct 31, 2023
66f450a
Merge pull request #239 from OpenHistoricalMap/locale-updates
danrademacher Oct 31, 2023
ee9f5df
Revert "Merge pull request #239 from OpenHistoricalMap/locale-updates"
danrademacher Oct 31, 2023
5f149a6
COmment username fix
danrademacher Oct 31, 2023
6c6159f
Merge pull request #240 from OpenHistoricalMap/comment-username-fix
danrademacher Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions images/web/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ RUN npm install -g svgo

# Install openstreetmap-website
RUN rm -rf $workdir/html
ENV OPENHISTORICALMAP_WEBSITE_GITSHA=9bf3c73f71b6749fff63095f15e6efb8dd978af3
ENV OPENHISTORICALMAP_WEBSITE_GITSHA=a71a6b795dda0d9c908495cf8862fdb8e9bf02e3
RUN git clone -b staging https://github.com/OpenHistoricalMap/ohm-website.git $workdir
WORKDIR $workdir
RUN git checkout $OPENHISTORICALMAP_WEBSITE_GITSHA

# change the echo here with a reason for changing the commithash
RUN echo 'update locale files with latest translations'
RUN echo 'fix locale file for comment username'
RUN git fetch

# Install Ruby packages
Expand Down
21 changes: 15 additions & 6 deletions images/web/config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ postcode_zoom: 15
api_timeout: 300
# Timeout for web pages in seconds
web_timeout: 30



# Periods (in hours) which are allowed for user blocks
user_block_periods: [0, 1, 3, 6, 12, 24, 48, 96, 168, 336, 731, 4383, 8766, 87660]
# Rate limit for message sending
Expand Down Expand Up @@ -84,12 +87,12 @@ oauth_key: "OAUTH_KEY"
id_application: ""
# Imagery to return in capabilities as blacklisted
imagery_blacklist:
# Current Google imagery URLs have google or googleapis in the domain
- ".*\\.google(apis)?\\..*/.*"
# Blacklist VWorld
- "http://xdworld\\.vworld\\.kr:8080/.*"
# Blacklist here
- ".*\\.here\\.com[/:].*"
# Current Google imagery URLs have google or googleapis in the domain
- ".*\\.google(apis)?\\..*/.*"
# Blacklist VWorld
- "http://xdworld\\.vworld\\.kr:8080/.*"
# Blacklist here
- ".*\\.here\\.com[/:].*"
# URL of Overpass instance to use for feature queries
overpass_url: "https://overpass-api.de/api/interpreter"
overpass_credentials: false
Expand Down Expand Up @@ -137,3 +140,9 @@ smtp_tls_verify_mode: "none"
smtp_authentication: null
smtp_user_name: null
smtp_password: null

# Rate limit for changeset comments
min_changeset_comments_per_hour: 1
initial_changeset_comments_per_hour: 6
max_changeset_comments_per_hour: 60
moderator_changeset_comments_per_hour: 36000
Loading