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

9531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stefan Baebler
fe2bd1ee1a Colour preview moved into new browse_tags_helper 
In 74d2c4336b browse_helper was split int two
 2019-08-31 11:40:42 +02:00
Stefan Baebler
e731dd71a7 Merge branch 'master' into tag-colour-preview-rebase 2019-08-31 11:34:57 +02:00
translatewiki.net
7c8779709f Localisation updates from https://translatewiki.net. 2019-08-29 20:29:03 +02:00
Tom Hughes
d99374434e Merge remote-tracking branch 'upstream/pull/2362' 2019-08-28 17:49:35 +01:00
Tom Hughes
783b5e3729 Merge remote-tracking branch 'upstream/pull/1926' 2019-08-28 17:23:10 +01:00
Andy Allan
0baa293699 Make the logo on the error page clickable 
Also use the same picture/srcset code as on the main header
 2019-08-28 16:02:34 +02:00
Andy Allan
a7092491b0
Merge pull request #2266 from systemed/patch-2 
Add user_<uid> class to diary entry div
 2019-08-28 15:20:21 +02:00
Tom Hughes
bf1b9a9b60 Exclude all vendored code from rubocop checking 2019-08-27 15:33:23 +01:00
Tom Hughes
8d102e2dc5 Drop ancient imported daemon generator 2019-08-27 15:23:30 +01:00
Tom Hughes
d515e1b0e4 Update bundle 2019-08-27 15:21:15 +01:00
Tom Hughes
bfd4f4993a Update yarn bundle 2019-08-27 15:09:31 +01:00
Tom Hughes
e1f2390d28 Merge remote-tracking branch 'upstream/pull/2359' 2019-08-27 14:59:53 +01:00
Bryan Housel
39896c76f8 Update to iD v2.15.5 2019-08-26 14:16:28 -04:00
translatewiki.net
94033b3a08 Localisation updates from https://translatewiki.net. 2019-08-26 12:29:57 +02:00
translatewiki.net
a973ca794f Localisation updates from https://translatewiki.net. 2019-08-23 06:49:42 +02:00
Tom Hughes
135ec35a91 Fix numericality validation to use correct integer only constraint 
Fixes #2355
 2019-08-22 12:14:06 +01:00
translatewiki.net
de973d08ca Localisation updates from https://translatewiki.net. 2019-08-19 11:38:09 +02:00
translatewiki.net
06957c3479 Localisation updates from https://translatewiki.net. 2019-08-15 18:29:24 +02:00
Tom Hughes
34c9d9cc6b Increase poltergeist timeout 2019-08-14 19:54:50 +01:00
Tom Hughes
0264b865e3 Update rubocop todo 2019-08-14 19:27:12 +01:00
Tom Hughes
4b646e17a8 Fix rubocop warnings 2019-08-14 19:27:02 +01:00
Tom Hughes
dcea5c6883 Update bundle 2019-08-14 19:21:43 +01:00
Tom Hughes
18f5f1d499 Explicitly require gpx in the trace model tests 
If we don't do this and no other test manages to trigger an
autoload before we run then we might try and autoload it inside
a MockFS block which will fail.
 2019-08-14 19:10:15 +01:00
Tom Hughes
389fee0151 Revert "Always look to the global scope for the GPX module" 
This reverts commit fbefe3550c.
 2019-08-14 19:06:09 +01:00
Sam Jenkins
42345cb9b7 Include any current search terms in the page title 
Fixes #2336
Closes #2347
 2019-08-14 18:58:08 +01:00
translatewiki.net
cdae792e36 Localisation updates from https://translatewiki.net. 2019-08-12 12:28:03 +02:00
translatewiki.net
21a3a69d10 Localisation updates from https://translatewiki.net. 2019-08-08 20:26:06 +02:00
Tom Hughes
dc5cdebc29 Create config/settings.local.yml in Vagrant provisioning script 2019-08-08 09:50:13 +01:00
Tom Hughes
2a9346adb0 Make sure phantomjs is installed 2019-08-07 17:29:26 +01:00
Tom Hughes
4efe7cdc10 Fix vagrant provisioning script 
Fixes #2343
 2019-08-07 17:27:25 +01:00
Tom Hughes
754e566f45 Exclude phantomjs from generic webkit as it's ancient 
Fixes #2339
 2019-08-05 20:41:22 +01:00
Tom Hughes
bc883cb926 Patch broken polyfill feature test 
https://github.com/Financial-Times/polyfill-service/issues/2006
 2019-08-05 20:39:24 +01:00
Tom Hughes
083375b3c3 Update polyfills 2019-08-05 20:29:56 +01:00
translatewiki.net
f32baeceb4 Localisation updates from https://translatewiki.net. 2019-08-05 12:19:36 +02:00
translatewiki.net
44839bee8b Localisation updates from https://translatewiki.net. 2019-08-01 18:40:11 +02:00
Tom Hughes
1addc078c0 Avoid trying to resize non-resizable images 
Fixed #2329
 2019-07-31 11:42:09 +01:00
translatewiki.net
9581fc24f8 Localisation updates from https://translatewiki.net. 2019-07-29 14:41:46 +02:00
Tom Hughes
02e5a93dc5 Merge remote-tracking branch 'upstream/pull/2330' 2019-07-26 18:01:50 +01:00
Quincy Morgan
cfb9d537a6 Remove file unrelated to iD 2.15.4 release 2019-07-26 12:52:16 -04:00
Quincy Morgan
241f12df40 Update to iD v2.15.4 2019-07-26 12:43:22 -04:00
marc tobias
61faea262a Pass viewbox to Nominatim when geocoding routing endpoints 
Fixes #2327
Closes #2328
 2019-07-25 19:24:36 +01:00
translatewiki.net
81f1e7982a Localisation updates from https://translatewiki.net. 2019-07-25 10:28:33 +02:00
Tom Hughes
4ff6067033 Fix text direction for Japanese 2019-07-23 19:27:34 +01:00
translatewiki.net
64b605a820 Localisation updates from https://translatewiki.net. 2019-07-22 14:13:38 +02:00
Tom Hughes
1f880528bd Fix new rubocop warnings 2019-07-18 16:47:08 +01:00
Tom Hughes
0af8b95b7d Update bundle 
Closes #2325
 2019-07-18 16:47:08 +01:00
translatewiki.net
bc37f1d851 Localisation updates from https://translatewiki.net. 2019-07-18 16:39:55 +02:00
Tom Hughes
5a54cb52f8 Drop paperclip 2019-07-17 19:12:30 +01:00
Tom Hughes
8a39c6b4a2 Drop old user image columns 2019-07-17 19:12:30 +01:00
Tom Hughes
826b70fdc5 Replace migrations that rely on models with rake tasks 
Replace some migrations that rely on relationships between
models to add subscriptions with rake tasks.
 2019-07-17 18:55:15 +01:00