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

10179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
e89742928d Merge remote-tracking branch 'upstream/pull/2548' 2020-03-18 20:15:06 +00:00
Tom Hughes
eec9e29c96 Merge remote-tracking branch 'upstream/pull/2448' 2020-03-18 14:58:06 +00:00
Tom Hughes
150895fb92 Merge remote-tracking branch 'upstream/pull/2562' 2020-03-18 14:51:25 +00:00
Andy Allan
1cb0767e3d Copy trace fixture files, rather than symlinking 
Since we are using tmpdirs in order to enable parallel testing, we
can go the full hog and drop the fakefs too and just copy all the
files directly into the tmpdir. If a test makes changes (e.g.
changing the icon file during an import) the copy in the tmpdir is
thrown away at the end of the test anyway.
 2020-03-18 15:35:55 +01:00
Andy Allan
0e612ea99a Remove unused directories 2020-03-18 15:04:18 +01:00
Andy Allan
6bd6cbd203 Enable parallel tests 2020-03-18 15:04:18 +01:00
Andy Allan
979a474c68 Use unique test directories for each trace test 
This allows tests to be run in parallel, since it avoids deleting
some of the symlinks that other tests expect to be there.
 2020-03-18 15:04:18 +01:00
Andy Allan
8407c0dd98 Use the settings for the destination of the gpx fixture symlinks 
This lets us change the settings values and have the fixtures appear
in the right place.
 2020-03-18 14:58:48 +01:00
Andy Allan
b8c1bbb4f8 Remove unnecessary h() calls on model attributes 
These were necessary in the rails 2.x era, but not now.
 2020-03-18 14:33:30 +01:00
Tom Hughes
a9c4b037a2 Merge remote-tracking branch 'upstream/pull/2561' 2020-03-18 11:15:01 +00:00
Andy Allan
5fdada204c Use bootstrap table striping to replace hand-cycled table stripes 
This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.
 2020-03-18 12:14:24 +01:00
Tom Hughes
33d70b3c2d Merge remote-tracking branch 'upstream/pull/2560' 2020-03-18 11:02:07 +00:00
Andy Allan
b0c50ab344 Enable remaining bootstrap components 
Fixes #2511
 2020-03-18 11:16:03 +01:00
translatewiki.net
380c936412 Localisation updates from https://translatewiki.net. 2020-03-16 15:52:51 +01:00
Tom Hughes
f32773a9f9 Merge remote-tracking branch 'upstream/pull/2558' 2020-03-14 15:51:23 +00:00
hikemaniac
74142661e3 Moved CSS rule 2020-03-14 16:39:21 +01:00
hikemaniac
ed076ebd61 Fix border-radius for search query input field 2020-03-14 16:06:46 +01:00
Tom Hughes
4f862afc10 Update javascript bundle 
Closes #2557
 2020-03-14 00:39:29 +00:00
translatewiki.net
f299e5a428 Localisation updates from https://translatewiki.net. 2020-03-12 19:27:55 +01:00
Tom Hughes
1cea9f6e41 Update bundle 2020-03-11 18:52:39 +00:00
translatewiki.net
4f6735a513 Localisation updates from https://translatewiki.net. 2020-03-09 16:43:08 +01:00
translatewiki.net
4770bae2a3 Localisation updates from https://translatewiki.net. 2020-03-05 17:37:12 +01:00
Tom Hughes
d399a6a806 Update bundle 2020-03-04 18:46:11 +00:00
translatewiki.net
0154b55f74 Localisation updates from https://translatewiki.net. 2020-03-02 14:51:22 +01:00
Tom Hughes
06122fc090 Enforce restrictions on issue visibility properly 2020-03-01 19:20:18 +00:00
Tom Hughes
75d1893343 Fix eslint warnings 2020-02-29 17:52:55 +00:00
Tom Hughes
0f3856fd1c Fix highlight of changesets with no bounding box 
A changeset with no bounding box has no map layer so trying to
set it's style throws an exception which means we don't get to
the code to set the style on the list entry.

Fixes #2541
 2020-02-29 17:43:19 +00:00
Tom Hughes
aaf9d15d56 Rework set_default_request_format ast set_request_formats 
Instead of trying to work out the exact format, just figure
out the list of allowed formats and let rails do the rest.
 2020-02-29 15:28:23 +00:00
Tom Hughes
c0c817b542 Update rubocop configuration 2020-02-28 22:50:08 +00:00
Tom Hughes
de9996e9f0 Update bundle 2020-02-28 22:26:51 +00:00
translatewiki.net
8909b954f7 Localisation updates from https://translatewiki.net. 2020-02-27 17:19:42 +01:00
Anton Melnichuk
b9c2829e75 css layout change only in content block 2020-02-27 10:29:37 +02:00
Anton Melnichuk
009a4dbb67 Merge branch 'master' of github.com:openstreetmap/openstreetmap-website into mobile-layout 2020-02-27 10:15:37 +02:00
Holger Jeromin
c70e919b47
rename internal variable 2020-02-26 20:27:52 +01:00
Andy Allan
93da959699
Merge pull request #2542 from boubascript/master 
Show mailto: links for email values in browse
 2020-02-26 17:09:27 +01:00
Andy Allan
73c95847a6
Merge pull request #2485 from mmd-osm/patch/json2 
JSON output nodes, ways, relations, map
 2020-02-26 15:55:48 +01:00
translatewiki.net
737990117e Localisation updates from https://translatewiki.net. 2020-02-24 15:45:28 +01:00
Tom Hughes
ecd84ccce8 Allow bundle path to be overridden when building database functions 2020-02-23 20:30:29 +00:00
Anton Melnichuk
248ad3ae05 the layout is triggered not by JS, but by media queries, now some map bugs have gone away themselves 
fix #2349 #2035 #1864
@tomhughes: 'Duplicate of many, many other tickets.'
 2020-02-21 10:08:38 +02:00
translatewiki.net
8529521e8c Localisation updates from https://translatewiki.net. 2020-02-20 16:10:10 +01:00
Boubacar
5d7b09e3bd change validation to accept only single email values 2020-02-19 23:44:40 -05:00
Boubacar
2cfd5b97a8 Merge branch 'master' of github.com:openstreetmap/openstreetmap-website 2020-02-19 20:52:35 -05:00
Tom Hughes
ff7ddb6b86 Merge remote-tracking branch 'upstream/pull/2381' 2020-02-19 19:11:32 +00:00
ENT8R
b84799f481 Keep the behaviour backwards-compatible 2020-02-19 12:58:47 +01:00
Boubacar
e854273c48 change Max for rubocop Metrics/ModuleLength 2020-02-17 12:33:47 -05:00
Boubacar
4cf0abb027 make email regex slightly more readable 2020-02-17 11:39:30 -05:00
Boubacar
d17d568961 Merge branch 'master' of github.com:openstreetmap/openstreetmap-website 2020-02-17 11:28:25 -05:00
translatewiki.net
196e0d8fe0 Localisation updates from https://translatewiki.net. 2020-02-17 15:01:18 +01:00
Boubacar
5e925cc720 Fix macosx-bundle-config link typo 
Removed an extra ')' that caused the last link for macosx-bundle-config to render incorrectly.
 2020-02-17 11:15:38 +00:00
Tom Hughes
ca5ca5d426 Merge remote-tracking branch 'upstream/pull/2540' 2020-02-17 10:22:12 +00:00