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

7904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Hughes
dca0be1886 Merge remote-tracking branch 'openstreetmap/pull/1045' 2015-08-27 21:21:45 +01:00
Tom Hughes
d0998f3a63 Merge remote-tracking branch 'openstreetmap/pull/1043' 2015-08-27 21:18:05 +01:00
Tom Hughes
e479a8297c Mark some flash messages as html safe 2015-08-27 20:43:50 +01:00
Simon Legner
91bd0b4b12 Display number of comments in changeset list 2015-08-27 21:26:31 +02:00
Simon Legner
2520bdb9eb Close layers panel on double-clicking a layer 
Relates to #465.
 2015-08-26 23:31:36 +02:00
Simon Legner
6d511fbd34 Directions, read "to" location in URL - fixes #998 2015-08-26 21:38:39 +02:00
Simon Legner
20139c08e5 Notes: show first comment as marker tooltip 2015-08-26 20:44:04 +02:00
Tom Hughes
ee9ac1930d Update to rails 4.2.4 2015-08-24 22:32:00 +01:00
Tom Hughes
618526ba62 Don't treat flash messages as raw 
This will likely break some things, but we should fix them
properly so that the rails auto-escaping can work.

Fixes #1027
 2015-08-24 10:49:04 +01:00
Dan Stowell
35fbcf2815 Move contextmenu callbacks to separate file 2015-08-19 22:58:20 +01:00
Tom Hughes
41eb7a1407 Test rendering of OAuth authorization page 2015-08-19 08:35:41 +01:00
Tom Hughes
036519a448 Add missing parenthesis 
Fixes #1037
 2015-08-19 08:25:41 +01:00
Tom Hughes
c9d35839be Fix new rubocopy warnings 2015-08-18 20:57:14 +01:00
Tom Hughes
7ce77006fa Update bundle 2015-08-18 20:19:36 +01:00
Tom Hughes
4f31859c4a Make button on OAuth authorization screen translatable 
Fixes #1025
 2015-08-18 19:19:35 +01:00
Tom Hughes
ad3ba427b7 Fix double XML declaration on trace RSS feeds 
Fixes #1034
 2015-08-18 19:09:11 +01:00
Holger Jeromin
0d01d06f22 added missing wording for note "not found" and "timeout" 2015-08-18 10:31:29 +02:00
Dan Stowell
0fa051fb40 Move leaflet.contextmenu 3rd party code to "vendor" folder 2015-08-17 08:55:48 +01:00
Tom Hughes
6910434fe0 Apply a timeout to most changeset API calls 2015-08-14 19:55:11 +01:00
Tom Hughes
bd1a466f21 Update jquery.cookie 2015-08-13 17:00:44 +01:00
Tom Hughes
05fb8b3e00 Update leaflet polyline plugin 2015-08-13 16:59:27 +01:00
Tom Hughes
ea4e33efa8 Update html5shiv to 3.7.3 2015-08-13 16:56:07 +01:00
Tom Hughes
6f5acd26e8 Enable https for thunderforest layers 2015-08-13 16:55:37 +01:00
Tom Hughes
5dc3e5b48a Don't show hidden notes to non-moderators in the user notes list 
Fixes #921
 2015-08-12 17:42:14 +01:00
Tom Hughes
caa1a0128a Hide hidden notes and comments correctly in the data browser 2015-08-12 17:20:30 +01:00
Tom Hughes
1b6c214ab5 Add tests for new note GPX elements 2015-08-10 19:19:23 +01:00
Markus Heidelberg
166dc76ae9 Make notes GPX valid and add useful official elements 
The "creator" attribute is required and "extensions" is the correct
name of this element.

Validated with SAXCount from the xerces-c package:

$ SAXCount -v=always -n -s -f notes.gpx

Original error messages:

    Error at file /home/markus/notes.gpx, line 2, char 171
      Message: no declaration found for element 'gpx'

    Error at file /home/markus/notes.gpx, line 2, char 171
      Message: attribute 'version' is not declared for element 'gpx'

After adding the "xmlns" attribute:

    Error at file /home/markus/notes.gpx, line 2, char 213
      Message: missing required attribute 'creator'

    Error at file /home/markus/notes.gpx, line 18, char 14
      Message: no declaration found for element 'extension'

    Error at file /home/markus/notes.gpx, line 26, char 7
      Message: element 'extension' is not allowed for content model '(ele?,time?,magvar?,geoidheight?,name?,cmt?,desc?,src?,link*,sym?,type?,fix?,sat?,hdop?,vdop?,pdop?,ageofdgpsdata?,dgpsid?,extensions?)'

The current errors now are caused by the missing XML schema for the
extensions.

Also add the time, name and link elements.
 2015-08-10 19:11:18 +01:00
Dan Stowell
e5b5faad72 tidier code 2015-08-09 19:29:37 +01:00
Dan Stowell
a2cf9b5b9f Enable/disable some context-menu options conditional on zoom 2015-08-09 19:11:36 +01:00
Dan Stowell
8d0472f2ca Allow users to get default contextmenu on shift-click 2015-08-09 12:11:07 +01:00
Dan Stowell
81d79f5e16 Simplify new-note marker placement - always in the centre 
(This removes a tweak added in 40b3c82, which we believe is
no longer relevant now the new-note dialogue is sidebar
rather than bubble.)
 2015-08-09 10:56:22 +01:00
Dan Stowell
6e12650a45 Add "Query features" to context menu 2015-08-07 21:15:05 +01:00
Dan Stowell
cd61c8e065 Implement context menu with: directions, add note, describe, centre. 2015-08-05 22:30:41 +01:00
Dan Stowell
9ef85e42ba Import leaflet.contextmenu source files 
From https://github.com/aratcliffe/Leaflet.contextmenu
latest commit 52a542da4f
 2015-08-05 19:49:07 +01:00
Tom Hughes
63dbfc15a6 Validate page numbers in URLs 2015-07-29 00:39:09 +01:00
Tom Hughes
af0ae25e6a Revert e04cab86 and add explicit small screen rules for overlay sidebar 2015-07-28 19:17:02 +01:00
Tom Hughes
098d1fc235 Allow customer URL schemas for OAuth callback URLs 
Fixes #1019
 2015-07-28 12:13:18 +01:00
Tom Hughes
93a617fec9 Error if geocoder#search is called with no arguments 2015-07-26 22:58:41 +01:00
Mateusz Konieczny
adb083dbc8 remove completely outdated entries from map key for default layer 2015-07-26 13:04:07 +02:00
Tom Hughes
e04cab862b Remove height specification for sidebar in small screen mode 2015-07-25 12:49:53 +01:00
Tom Hughes
45b70dea84 Fix small screen CSS rules that match on a body class 2015-07-23 18:36:16 +01:00
Siebrand Mazeland
fb2ea69d08 Localisation updates from https://translatewiki.net. 2015-07-23 19:06:03 +02:00
Tom Hughes
a34935df9b Fix a missing translation 2015-07-23 14:23:23 +01:00
Tom Hughes
619db2e89c Raise an exception for missing translations in test mode 2015-07-23 14:23:01 +01:00
Tom Hughes
6886a149b2 Use correct translation for new notes in RSS feed 2015-07-23 13:50:28 +01:00
Tom Hughes
4dceacdeba Make switch to compact and small modes dynamic 
The point where we need to switch between normal mode, compact mode
and small mode varies due to different string lengths in different
languages, but that can't be expressed by a media query, so use some
javascript to update as the window size changes.

Fixes #1014
 2015-07-22 22:48:22 +01:00
Tom Hughes
e68b5db140 Add missing ::before to archaeological_site CSS rule 
Fixes #1013
 2015-07-22 11:56:33 +01:00
Tom Hughes
629ae62b73 Require a valid session token to resend a confirmation 
Make user#confirm_resend require a valid token in the session
that matches the requested user, and ensure trying to login as
an unconfirmed user sets such a token.

Fixes #1010
 2015-07-20 21:32:34 +01:00
Tom Hughes
9fdea1c739 Temporary fix to avoid showing emails 2015-07-20 15:07:18 +01:00
Tom Hughes
82cefb5929 Add support for generating logstash friendly logs 2015-07-19 19:24:20 +01:00