cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10164 commits 4 branches 1 tag 499 MiB
Commit graph

10164 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
c87d316a1d Merge remote-tracking branch 'upstream/pull/2710' 2020-07-15 14:37:59 +01:00
Tom Hughes
5cc4e93347 Merge remote-tracking branch 'upstream/pull/2709' 2020-07-15 14:14:39 +01:00
Andy Allan
3bc2b32111 Rephrase 'replying' text to clarify what will actually happen 
Fixes #2166
 2020-07-15 15:13:29 +02:00
Andy Allan
a9f751ec45 Remove unnecessary css 
Images have no border in modern browsers, and bootstrap's reset also
sets this.
 2020-07-15 13:58:56 +02:00
Andy Allan
b4e7f5eaca Remove unused css 2020-07-15 12:27:15 +02:00
Andy Allan
d89a30421c Use bootstrap backgrounds and text utilities for read issue reports 2020-07-15 12:12:35 +02:00
Andy Allan
e157b37ce5 Rename nav-related body classes 
This makes it clearer that the classes are only for navigation menu
matters. Other things should be done on media queries, or ideally,
using bootstrap components like grids.

This has a side effect of removing the smaller font size from the
body when the navigation menu is in the small-nav state.
 2020-07-15 11:40:02 +02:00
Andy Allan
58050240d6 Move the login form rules to be based on screen size 
Ideally this would be refactored to be mobile-first, but is likely
to be replaced by more general bootstrap form refactoring anyway.
 2020-07-15 11:21:08 +02:00
Andy Allan
46bd1a9a2e Remove webkit-appearance: none 
This is the default anyway, and we don't need this for anything specific.
 2020-07-15 11:19:29 +02:00
Andy Allan
3f6fd290d7 Rework the about header size change to be based on the screen width, not the menu state 
Also reworks to be mobile-first
 2020-07-15 10:48:04 +02:00
Andy Allan
988446c307 Remove dead CSS code - nothing has the user_map class 2020-07-15 10:35:19 +02:00
translatewiki.net
06023cde27 Localisation updates from https://translatewiki.net. 2020-07-14 10:23:57 +02:00
Tom Hughes
8b081b4f58 Merge remote-tracking branch 'upstream/pull/2707' 2020-07-14 08:16:03 +01:00
dependabot[bot]
3f4397711d
Bump autoprefixer-rails from 9.8.4 to 9.8.5 
Bumps [autoprefixer-rails](https://github.com/ai/autoprefixer-rails) from 9.8.4 to 9.8.5.
- [Release notes](https://github.com/ai/autoprefixer-rails/releases)
- [Changelog](https://github.com/ai/autoprefixer-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ai/autoprefixer-rails/compare/9.8.4...9.8.5)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-14 05:02:13 +00:00
translatewiki.net
fc832a1e6a Localisation updates from https://translatewiki.net. 2020-07-10 11:38:55 +02:00
Andy Allan
a8d2117cde
Merge pull request #2702 from openstreetmap/dependabot/bundler/aws-sdk-s3-1.74.0 
Bump aws-sdk-s3 from 1.73.0 to 1.74.0
 2020-07-09 13:24:45 +02:00
Andy Allan
fae77c392e
Merge pull request #2701 from openstreetmap/dependabot/bundler/factory_bot_rails-6.1.0 
Bump factory_bot_rails from 6.0.0 to 6.1.0
 2020-07-09 13:24:25 +02:00
dependabot[bot]
d449bfb483
Bump aws-sdk-s3 from 1.73.0 to 1.74.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.73.0 to 1.74.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-09 05:01:45 +00:00
dependabot[bot]
8de2477b08
Bump factory_bot_rails from 6.0.0 to 6.1.0 
Bumps [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/thoughtbot/factory_bot_rails/releases)
- [Changelog](https://github.com/thoughtbot/factory_bot_rails/blob/master/NEWS.md)
- [Commits](https://github.com/thoughtbot/factory_bot_rails/compare/v6.0.0...v6.1.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-09 05:01:27 +00:00
Tom Hughes
92a4c1feff Fix eslint warning 2020-07-08 19:25:03 +01:00
Tom Hughes
cfb2f2988c Merge remote-tracking branch 'upstream/pull/2698' 2020-07-08 19:10:01 +01:00
Tom Hughes
efa2c20bff Merge remote-tracking branch 'upstream/pull/2696' 2020-07-08 19:09:55 +01:00
Tom Hughes
9be62ca4bb Allow image loading from tileserver.memomaps.de 2020-07-08 19:07:49 +01:00
Tom Hughes
4cf3c3b6ed Merge remote-tracking branch 'upstream/pull/2670' 2020-07-08 19:04:04 +01:00
Tom Hughes
3a43f9fe04 Merge remote-tracking branch 'upstream/pull/2697' 2020-07-08 18:57:32 +01:00
Tom Hughes
77bece20ff Merge remote-tracking branch 'upstream/pull/2700' 2020-07-08 18:43:26 +01:00
Tom Hughes
c74ec0aa49 Merge remote-tracking branch 'upstream/pull/2699' 2020-07-08 18:33:21 +01:00
Andy Allan
8c326a6c1f Remove unnecessary layout calls from api controllers 
These were left over from the refactoring of the controllers into api and non-api versions.
 2020-07-08 18:51:27 +02:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Andy Allan
1977e66ace Use bootstrap text-muted in place of custom deemphasze class 
This avoids changing anything related to forms, since they will be
switched over to bootstrap separately.
 2020-07-08 18:30:15 +02:00
Andy Allan
6d9434e14d Remove some extraneous css 
The trace part is actually removing html, but I thought it was CSS
when I first noticed the blank space on the page.
 2020-07-08 16:57:49 +02:00
Andy Allan
8192c0bd17 Rework the users#show page to avoid custom column css 
This uses bootstrap instead, ensuring the map shows before the
text on small screens, but to the right of it on md+ widths. The
height of the map also changes at this breakpoint instead of being
based on the menu width (body.small).

The account edit page was also changed to match the content_map
changes, and a full width map is now used. This can be changed, if
required, using bootstrap breakpoints but I like it as it is.
 2020-07-08 16:46:15 +02:00
Tom Hughes
9f993fe8c8 Fix new rubocop warnings 2020-07-07 10:44:52 +01:00
Tom Hughes
1ea946636b Merge remote-tracking branch 'upstream/pull/2693' 2020-07-07 10:41:34 +01:00
Tom Hughes
96ee7ef95c Only report traces as offline when they are offline 2020-07-07 10:37:56 +01:00
Tom Hughes
ce99bfd9ac Remove some debug logging comitted by mistake 2020-07-07 10:37:39 +01:00
dependabot[bot]
0dd61cbf6c
Bump rubocop-performance from 1.6.1 to 1.7.0 
Bumps [rubocop-performance](https://github.com/rubocop-hq/rubocop-performance) from 1.6.1 to 1.7.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-performance/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-performance/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-performance/compare/v1.6.1...v1.7.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-07 05:02:03 +00:00
translatewiki.net
93cd40ebd7 Localisation updates from https://translatewiki.net. 2020-07-06 18:51:54 +02:00
Tom Hughes
d447465f04 Merge remote-tracking branch 'upstream/pull/2691' 2020-07-06 08:33:51 +01:00
dependabot[bot]
728259852d
Bump eslint from 7.3.1 to 7.4.0 
Bumps [eslint](https://github.com/eslint/eslint) from 7.3.1 to 7.4.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v7.3.1...v7.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-06 05:01:13 +00:00
Tom Hughes
2def62ee19 Fix errors with GPX offline mode 2020-07-05 14:49:12 +01:00
Tom Hughes
d8a1cbd27b Merge remote-tracking branch 'upstream/pull/2689' 2020-07-04 23:57:12 +01:00
Andy Allan
6040814625 Rephrase the 'used_by' text on the about page. 2020-07-04 18:26:04 +02:00
Tom Hughes
b8eaf227d9 Merge remote-tracking branch 'upstream/pull/2688' 2020-07-04 10:39:07 +01:00
Tom Hughes
62fb6cb1af Merge remote-tracking branch 'upstream/pull/2687' 2020-07-04 10:39:02 +01:00
Andy Allan
8cd83426cc Make the back button not look disabled 
This switches the message buttons to use bootstrap, so that we can have a back button that looks clickable.

Alternative implementation of #2386
 2020-07-04 11:20:46 +02:00
Andy Allan
bae057dbdf Avoid list markers for the richtext help text 2020-07-04 10:51:16 +02:00
Andy Allan
2b962023e3
Merge pull request #2674 from openstreetmap/dependabot/bundler/bootstrap-4.5.0 
Bump bootstrap from 4.3.1 to 4.5.0
 2020-07-04 10:12:18 +02:00
Tom Hughes
c9b9f07ac7 Merge remote-tracking branch 'upstream/pull/2685' 2020-07-03 07:09:52 +01:00
dependabot[bot]
313ac3fba1
Bump aws-sdk-s3 from 1.72.0 to 1.73.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.72.0 to 1.73.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-03 05:01:14 +00:00