Commit graph

6273 commits

Author SHA1 Message Date
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
Tom Hughes
43f52daeaa Remove unused partials 2013-11-25 00:51:53 +00:00
Tom Hughes
581032b701 Enable oauth for geocoder#search 2013-11-24 17:05:02 +00:00
Tom Hughes
686aae7732 Block max_id for changeset feeds instead of page which is no longer used 2013-11-24 17:02:38 +00:00
Tom Hughes
272a708b0f Format browse page titles in a consistent way 2013-11-24 16:55:56 +00:00
Tom Hughes
114f722860 Don't wait for a timeout when the browser doesn't support geolocation
If the browser doesn't support geolocation then we might as well just
start manual edit mode straight away rather than waiting four seconds.
2013-11-24 16:46:58 +00:00
Tom Hughes
312bc4e72c Drop ejs as we aren't using it anymore 2013-11-24 16:43:06 +00:00
Tom Hughes
47385464cd Remove redundant code
Attempts to view an object are now redirected to the browse pages
so we will never see a node/way/relation parameter here.
2013-11-24 16:38:53 +00:00
Tom Hughes
532d108536 Make sure all pages using the map layout call require_oauth 2013-11-24 15:29:38 +00:00
Tom Hughes
65d5f3a1db Remove code to fixup authenticity tokens on page load
We don't cache anything with forms in now, so the code is no longer
needed and the comment was now misleading as extra code has been added
to the ready callback.
2013-11-24 12:13:02 +00:00
John Firebaugh
d967a4efc0 Update to iD v1.3.3 2013-11-22 16:52:42 -08:00
John Firebaugh
f387d99728 Compromise on fonts to look better on Windows 2013-11-22 12:58:09 -08:00
John Firebaugh
bbc72e26bc Tweak welcome text 2013-11-22 12:29:45 -08:00
John Firebaugh
954261fb1c Restore prev/next changeset by user links 2013-11-22 12:17:27 -08:00
John Firebaugh
1557f9cf89 Pass along gpx parameter to iD
See https://github.com/systemed/iD/issues/1965
2013-11-22 10:57:07 -08:00
John Firebaugh
fbd5a88b24 Use machine-readable lat/lon format 2013-11-21 11:31:58 -08:00
Marco Antonio Frias Butrón
ebe7938886 Fix hidden text behind the search icon 2013-11-21 08:47:19 +00:00
Siebrand Mazeland
5a26a23cda Localisation updates from http://translatewiki.net. 2013-11-21 06:52:31 +00:00
Aaron Lidman
ee10cb1290 Hide note overflow
Mostly for long links from craigslist notes.
2013-11-20 13:44:40 -08:00
Aaron Lidman
4c0a5ee7d9 Add coordinate detail to node pages 2013-11-20 13:31:05 -08:00
Aaron Lidman
86ae401aac Nominatim results zoom to the result location 2013-11-20 12:37:57 -08:00
Aaron Lidman
5384ee236c Fixed individual note marker implementation, closes #78
- Removed forced noteLayer view, now respects current selection just
like an other browse page.
- Made marker replacement it’s own thing, seperate from noteLayer.
- Reduced opacity on noteLayer notes, it makes the selected note stand
out more
2013-11-20 11:43:39 -08:00
John Firebaugh
b5825b2f64 Sign Up -> Start Mapping 2013-11-19 15:02:31 -08:00
John Firebaugh
826ab544b1 Logout -> Log Out 2013-11-19 14:59:25 -08:00
John Firebaugh
d0de36b607 Refine changeset browse behavior
The general history view shows changesets in the current view
and updates when you move the map. The view for an individual
user, nearby users, or friends zooms the map to the extent of
the results, and doesn't change when you move the map.
2013-11-19 12:10:14 -08:00
Aaron Lidman
a5e8b4cb88 Improved export warning, removed heading 2013-11-19 11:57:30 -08:00
John Firebaugh
cf0fccec1f Revert padding; fixes header baseline 2013-11-19 11:45:49 -08:00
John Firebaugh
bd21a1f7ff Eliminate loading flash for welcome overlay 2013-11-19 11:18:11 -08:00
John Firebaugh
e91956d0f7 Fix test failures 2013-11-19 10:30:18 -08:00
John Firebaugh
44629832dd Merge branch 'master' into redesign
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
2013-11-19 09:42:47 -08:00