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

9944 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
c56f7a37fc Merge remote-tracking branch 'upstream/pull/2460' 2019-12-11 16:36:40 +00:00
Andy Allan
13f0591605 Wrap table header rows in thead 2019-12-11 17:22:23 +01:00
Tom Hughes
3955338682 Merge remote-tracking branch 'upstream/pull/2459' 2019-12-11 16:00:14 +00:00
Andy Allan
efa5f6d4b6 Use a new colour name for the vibrant greens 2019-12-11 16:51:04 +01:00
Andy Allan
c0f5e4ede8 Use paramatered colours for greys 2019-12-11 16:20:16 +01:00
Andy Allan
9b6114ab0b Combine the two different offwhite background colours, and use the lighter one 2019-12-11 15:57:23 +01:00
Tom Hughes
7531060a12 Use squiggly heredocs 2019-12-11 10:40:41 +00:00
Tom Hughes
48463e60cb Merge remote-tracking branch 'upstream/pull/2458' 2019-12-11 10:21:08 +00:00
Andy Allan
7595e5a4dd Use squiggly heredocs instead of rails strip_heredoc 
Squiggly heredocs were introduced in ruby 2.3 and I prefer the ability
to indent the closing heredoc marker.
 2019-12-11 10:54:19 +01:00
Andy Allan
ec5039d9cc Use bootstrap typography 2019-12-11 10:24:57 +01:00
Andy Allan
dc96834ebb Use bootstrap cards to spruce up the help page 2019-12-11 10:24:57 +01:00
Andy Allan
01faa2e287 Custom bootstrap with all components disabled 
This lets us work through things slowly as we use more features
 2019-12-11 10:24:57 +01:00
Andy Allan
7f9dacbada Add bootstrap 4 2019-12-11 10:24:57 +01:00
Andy Allan
cffff1635d Rename bootstrap-tooltips file 
This avoids clashing with including upstream bootstrap
 2019-12-11 10:24:05 +01:00
translatewiki.net
b9d9785330 Localisation updates from https://translatewiki.net. 2019-12-09 16:02:49 +01:00
Tom Hughes
d3373754f0 Update bundle 
Closes #2454
 2019-12-06 07:09:49 +00:00
translatewiki.net
59f53f18b0 Localisation updates from https://translatewiki.net. 2019-12-05 15:35:38 +01:00
Tom Hughes
86b355c4df Use delete method correctly when deleting traces 
Fixes #2453
 2019-12-04 21:06:19 +00:00
Tom Hughes
fc8189685e Fix erblint warnings 2019-12-04 19:58:21 +00:00
Tom Hughes
57f5b7840e Fix rubocop warnings 2019-12-04 19:31:53 +00:00
Tom Hughes
743a764f3b Remove version lock on autoprefixer-rails 2019-12-04 19:01:26 +00:00
Tom Hughes
95c3e3b6ff Update bundle 2019-12-04 18:42:47 +00:00
Tom Hughes
6a68e7676d Merge remote-tracking branch 'upstream/pull/2451' 2019-12-04 16:08:26 +00:00
Andy Allan
35370684e5 Make the back button link to the inbox when reading received messages 2019-12-04 16:42:57 +01:00
Andy Allan
f1c6a87aa1
Merge pull request #2427 from mmd-osm/patch/remove_expand_bbox 
Remove expand_bbox endpoint
 2019-12-04 12:48:34 +01:00
Tom Hughes
ff3abf5dd8 Merge remote-tracking branch 'upstream/pull/2450' 2019-12-04 11:33:31 +00:00
Andy Allan
44c6fdc273 Use the conventional 'destroy' method name for destroying traces 2019-12-04 11:59:18 +01:00
Tom Hughes
dba3940571 Replace content_tag_for with a simple tr element 2019-12-03 22:54:55 +00:00
translatewiki.net
40809825e8 Localisation updates from https://translatewiki.net. 2019-12-02 09:39:56 +01:00
translatewiki.net
32b5a398a5 Localisation updates from https://translatewiki.net. 2019-11-28 16:50:26 +01:00
Tom Hughes
e6667b7ff5 Fix rubocop warnings 2019-11-27 11:47:16 +00:00
Tom Hughes
461f99dfe0 Merge remote-tracking branch 'upstream/pull/2447' 2019-11-27 11:11:55 +00:00
Andy Allan
a41d500b9f Create an ApplicationRecord for models to inherit from 
This is the default for Rails 5+, and also paves the way for
multiple database support.
 2019-11-27 11:50:48 +01:00
Tom Hughes
a3a95616d9 Drop bowser, which is no longer used 2019-11-26 18:56:12 +00:00
Guillaume Rischard
7e390ec89b Always use http to talk to josm 
See discussion in #2445 and resulting conclusion that JOSM no
longer even listens on the https port.

Closes #2446
 2019-11-26 18:53:54 +00:00
translatewiki.net
cd0254d148 Localisation updates from https://translatewiki.net. 2019-11-25 15:43:37 +01:00
Tom Hughes
cc14fbe36e Update to bowser 2.7.0 2019-11-25 12:45:53 +00:00
Tom Hughes
621780c9cf Disable host validation in development mode 2019-11-25 12:45:39 +00:00
Tom Hughes
c672a73de3 Merge remote-tracking branch 'upstream/pull/2423' 2019-11-24 11:37:48 +00:00
Tom Hughes
c468af5fbd Errors have text/plain as the content type 2019-11-24 11:05:02 +00:00
Tom Hughes
1f4d48eaf3 Fix some deprecation warnings 2019-11-24 11:05:02 +00:00
Tom Hughes
22cd2314e5 Update to rails 6.0.1 2019-11-24 11:05:02 +00:00
Tom Hughes
b6ecdb7507 Drop use of record_tag_helper 
We only had one place using it and there's no sign of
upstream doing a rails 6 compatible release.
 2019-11-24 11:05:02 +00:00
Tom Hughes
bf68eb6607 Fix rubocop warning 2019-11-24 11:04:35 +00:00
Tom Hughes
84d54522f2 Update bundle 2019-11-24 10:49:26 +00:00
Tom Hughes
b34e976bb5 Switch to fork of actionpack-page_caching with rails 6 support 2019-11-24 10:47:10 +00:00
Mayank Tankhiwale
4596fa9420 Fix 2402 PR lint errors 2019-11-23 22:22:29 +05:30
Mayank Tankhiwale
11cd1c9fc1 Merge branch 'master' of https://github.com/tankhiwale/openstreetmap-website 2019-11-23 20:32:47 +05:30
Mayank Tankhiwale
9f7ec064e4 Fix #2402 
1. Modified about routes
2. Accept the new params in site#about
3. Update about.html.erb
 2019-11-23 20:26:19 +05:30
translatewiki.net
7c89e7c0b4 Localisation updates from https://translatewiki.net. 2019-11-21 15:12:33 +01:00