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

5562 commits

Author SHA1 Message Date
Tom Hughes
6f8966e7c1 Note events use "opened" not "open" as the status 2019-12-16 22:26:33 +00:00
Tom Hughes
ac6a872a48 Avoid errors when /edit is called on an invalid object 2019-12-16 21:23:09 +00:00
hikemaniac
e6d7471ab6 Fixed comment textarea going off the sidebar, added border-radius to form fields 2019-12-15 16:04:29 +01:00
Tom Hughes
a2ad08b2e2 Use correct link for settings page 2019-12-12 19:12:38 +00:00
Tom Hughes
9153fd3559 Fix link in error page when a user has public edits disabled 2019-12-12 18:50:30 +00:00
mmd
ffe636e6bd Add In-Reply-To, References headers to email 
Closes https://github.com/openstreetmap/openstreetmap-website/issues/2430
 2019-12-12 18:25:29 +01:00
Tom Hughes
2f419c7ab0 Merge remote-tracking branch 'upstream/pull/2461' 2019-12-11 17:31:16 +00:00
Andy Allan
040302286f Remove ignoring of nearby column 
This is the final stage in the process. Now that the migrations are run,
and apps restarted, it is safe to remove the ignore_column declaration.
 2019-12-11 18:08:31 +01:00
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
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
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
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
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
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
Tom Hughes
cc14fbe36e Update to bowser 2.7.0 2019-11-25 12:45:53 +00:00
Tom Hughes
1f4d48eaf3 Fix some deprecation warnings 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
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
Tom Hughes
db63076247 Merge remote-tracking branch 'upstream/pull/2442' 2019-11-20 19:54:24 +00:00
Tom Hughes
81fb26d840 Merge remote-tracking branch 'upstream/pull/2434' 2019-11-20 19:17:29 +00:00
Tom Hughes
6ec02bcdb2 Merge remote-tracking branch 'upstream/pull/2440' 2019-11-20 19:01:13 +00:00
hikemaniac
3ed62aa115 Updated colours of landuse icons, added icon for natural=scrub 2019-11-20 19:55:51 +01:00
Tom Hughes
b5d4c262dd Switch to using jbuilder for JSON templates 2019-11-20 18:54:04 +00:00
Andy Allan
8ad88b9ddc Move user preference XML generation to a view 2019-11-20 16:39:23 +01:00
Andy Allan
25ebf87e5a Rename UserPreference controller methods to follow rails conventions more closely 2019-11-20 16:09:48 +01:00
Andy Allan
bc850d1d37 Move Relation.to_xml and to_xml_node out of the model and into tests 2019-11-20 15:45:28 +01:00
Andy Allan
2b1bac1279 Move Way.to_xml and to_xml_node out of the model and into tests 
This code is only used in the tests. Refs #2433
 2019-11-20 15:31:47 +01:00
rubynho
a65ccb55b5 Improve parameters alignment 2019-11-17 16:08:38 -02:00
rubynho
5542fd2bce Pluralize notifier message when other than 1 
Correctly pluralize the word point in the notification message based
on the given possible points.
 2019-11-17 14:55:20 -02:00
Tom Hughes
efcb56b68b Merge remote-tracking branch 'upstream/pull/2433' 2019-11-14 12:24:50 +00:00
Andy Allan
4e7c0c3008 Move Node.to_xml and to_xml_node out of model and into tests 
This code is only used in the tests for creating 'fixture' payloads,
so it shouldn't be kept in the models.
 2019-11-13 17:01:40 +01:00