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

6202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Siebrand Mazeland
1999e94186 Localisation updates from https://translatewiki.net. 2013-12-02 08:40:42 +00:00
Tom Hughes
f53ae66966 Prevent wrapping of dates in message lists 2013-12-01 23:00:41 +00:00
Tom Hughes
63617dabb1 Fix javascript eror redirecting to new notes 2013-12-01 22:41:30 +00:00
Tom Hughes
d5a765588f Fix URL updating in Potlatch 1 
Potlatch 1 has hard coded calls to updatelinks, so rename the
updatelinks function to updateLinks and add an updatelinks function
using the old style argument list for Potlatch 1 to call.
 2013-12-01 22:37:04 +00:00
Tom Hughes
a30a29f41a Fix stripping of trailing slash 2013-12-01 22:30:34 +00:00
Tom Hughes
96babc10b0 Strip any trailing slash from the initial location 2013-12-01 21:47:55 +00:00
Richard Fairhurst
640ff57465 Add 'x' to close welcome box; remember preference 2013-12-01 21:36:25 +00:00
Tom Hughes
aff0583a34 Drop monkey patch now we're using option style redirects 
Option style redirects escape path parameters correctly, so we
can drop out monkey patch.
 2013-12-01 20:54:52 +00:00
Tom Hughes
248d0b863c Force the X-Page-Title value to be treated as UTF-8 
This is basically a black magic hack to get javascript to treat
a string as UTF-8 and decode it to the correct form.

http://monsur.hossa.in/2012/07/20/utf-8-in-javascript.html
 2013-12-01 20:31:48 +00:00
Tom Hughes
61bb31ebdd Preserve the bounding box when redirecting history URLs 
Using the options style for the redirect seems to cause parameters
to be preserved, which the path style of redirect does not.
 2013-12-01 19:59:57 +00:00
Tom Hughes
3b6580297f Rename changed translation to avoid test failures 2013-12-01 09:11:59 +00:00
Siebrand Mazeland
73341cfefd Localisation updates from https://translatewiki.net. 2013-11-30 18:36:16 +00:00
Tom Hughes
49a4efcfa0 Don't offer iD on IE11 2013-11-30 17:53:42 +00:00
RM87
61fc15aee1 Remove spurious < character as reported in #508 2013-11-30 16:09:47 +00:00
Tom Hughes
28a19f5f13 Load gravatar images over https on https pages 2013-11-30 15:38:11 +00:00
Tom Hughes
a36f3a9307 Add margin space below lists on non-map content pages 2013-11-30 14:41:39 +00:00
Tom Hughes
ec8a601309 Test for the map argument correctly 2013-11-30 14:18:08 +00:00
Tom Hughes
e73a770d81 Remove monkey patch which has been merged upstream in rails 4 2013-11-30 14:02:49 +00:00
Tom Hughes
309831a619 Monkey patch escaping in redirect routes 
The correct method of escaping depends on whether the parameter
is being substituted in the path or the query, but all our ones
are substitued in the path so use URI.escape instead of the
standard Rack::Utils.escape which does query escaping.

https://github.com/rails/rails/issues/13110
 2013-11-30 13:53:48 +00:00
Tom Hughes
a2b9f593f5 Don't throw an exception if the hash doesn't contain a map argument 2013-11-30 13:20:31 +00:00
Tom Hughes
315d1dab54 Redirect /?query= to /search?query= 2013-11-30 12:38:44 +00:00
Tom Hughes
82b6e05dc4 Update the OpenSearch definition for URL changes 2013-11-30 12:35:01 +00:00
Tom Hughes
a9f4549327 Tidy up the OAuth authorization screens 
Make sure all messages are translatable, separate errors from
user initiated denial of authorization.
 2013-11-30 12:25:22 +00:00
Tom Hughes
bfd11bf79a Change "Copyright & License" to "Copyright" and move it left 2013-11-30 10:51:43 +00:00
Paul Norman
a768e7111c Restore Copyright & License link 
The copyright and license is an important part of OpenStreetMap.
This restores the copyright & license link to the menu, placing
it in the top-right with the other pages which do not display a map.

Fixes #548

Fixes comments in https://github.com/openstreetmap/openstreetmap-website/pull/498#issuecomment-26741518
 2013-11-30 10:36:14 +00:00
Tom Hughes
d375caf7a3 Update to CPK 6.0.1 and drop monkey patch 2013-11-30 10:28:41 +00:00
Tom Hughes
be088602fb Revert 39468944 and fix osmlab#91 without loosing the editor choice 2013-11-29 15:33:09 +00:00
Tom Hughes
37baed28b1 Pass the correct ID when switching to a node/way/relation view 2013-11-29 09:53:16 +00:00
Tom Hughes
223d5fd132 Stop browse routes matching user URLs 2013-11-29 00:05:25 +00:00
Tom Hughes
d09009b1fa Allow moderators to reopen hidden notes 2013-11-28 20:25:36 +00:00
Tom Hughes
e0028d8639 Add a title for hidden notes 2013-11-28 20:23:50 +00:00
Tom Hughes
832969fddd Add hidden_by message for notes hidden by moderators 2013-11-28 19:06:17 +00:00
Tom Hughes
68a3df4d53 Merge branch 'redesign' 
Conflicts:
	app/assets/stylesheets/common.css.scss
 2013-11-28 17:30:53 +00:00
Tom Hughes
fb9b4edcdd Add tests for new redirects and fix a few bugs in the redirects 2013-11-28 08:56:52 +00:00
Tom Hughes
3cd5f45e08 Simplify browse routes and make routes more consistent 
This gets rid of the /browse/ prefix and uses /history consistently
for all routes that show a list of changesets.
 2013-11-28 00:14:07 +00:00
John Firebaugh
edfd358289 Update to iD v1.3.4 2013-11-26 19:34:53 -08:00
John Firebaugh
6b236ec95b Fix feed link for pushState loaded history page 2013-11-25 15:47:42 -08:00
Tom Hughes
51ade94113 Drop max_id from the changeset feed URL 2013-11-25 22:28:02 +00:00
John Firebaugh
3946894492 Fix accumulation of parameters in edit link 2013-11-25 13:49:47 -08:00
John Firebaugh
4729163aa8 Fix scroll bar issue on edit pages 2013-11-25 13:37:44 -08:00
John Firebaugh
ca64b39e0d Make main page flash messages visible 2013-11-25 13:20:59 -08:00
Tom Hughes
8b84f11a45 There are four methods, not three 2013-11-25 21:13:59 +00:00
Tom Hughes
fbf92b17a0 Add test for redirect routes 2013-11-25 21:13:59 +00:00
John Firebaugh
415f6a42c7 Add explanatory comment 2013-11-25 13:12:04 -08:00
John Firebaugh
0dbd18e2bb Document/clarify OSM.Router use 2013-11-25 13:10:07 -08:00
Tom Hughes
560763d224 Revert "Remove redundant code" 
This reverts commit 28530085fb.
 2013-11-25 20:41:33 +00:00
Aaron Lidman
ccf7981c48 Sort changesets by id rather than created_at, closes #87 2013-11-25 12:27:52 -08:00
Aaron Lidman
cf87744cd7 Fix border-bottom for browse#note, closes #88 2013-11-25 12:04:35 -08:00
Tom Hughes
8482a525c0 Remove unneessary return added accidentally 2013-11-25 19:14:52 +00:00
Tom Hughes
87bf5e73d4 Fix "in bounds" test in updateData 
Only call getData if the new bounds are not contained within the
old bounds, and only update the bounds after a successful load so
that the don't change if we error out.
 2013-11-25 19:13:01 +00:00