]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sat, 30 Nov 2013 10:20:22 +0000 (10:20 +0000)]
Update to CPK 6.0.1 and drop monkey patch
Tom Hughes [Fri, 29 Nov 2013 15:33:09 +0000 (15:33 +0000)]
Revert
39468944 and fix osmlab#91 without loosing the editor choice
Tom Hughes [Fri, 29 Nov 2013 09:52:46 +0000 (09:52 +0000)]
Pass the correct ID when switching to a node/way/relation view
Tom Hughes [Fri, 29 Nov 2013 00:05:25 +0000 (00:05 +0000)]
Stop browse routes matching user URLs
Tom Hughes [Thu, 28 Nov 2013 20:25:36 +0000 (20:25 +0000)]
Allow moderators to reopen hidden notes
Tom Hughes [Thu, 28 Nov 2013 20:23:50 +0000 (20:23 +0000)]
Add a title for hidden notes
Tom Hughes [Thu, 28 Nov 2013 19:06:17 +0000 (19:06 +0000)]
Add hidden_by message for notes hidden by moderators
Tom Hughes [Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)]
Merge branch 'redesign'
Conflicts:
app/assets/stylesheets/common.css.scss
Tom Hughes [Thu, 28 Nov 2013 08:56:52 +0000 (08:56 +0000)]
Add tests for new redirects and fix a few bugs in the redirects
Tom Hughes [Thu, 28 Nov 2013 00:14:07 +0000 (00:14 +0000)]
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.
John Firebaugh [Wed, 27 Nov 2013 03:34:53 +0000 (19:34 -0800)]
Update to iD v1.3.4
John Firebaugh [Mon, 25 Nov 2013 23:46:14 +0000 (15:46 -0800)]
Fix feed link for pushState loaded history page
Tom Hughes [Mon, 25 Nov 2013 22:27:49 +0000 (22:27 +0000)]
Drop max_id from the changeset feed URL
John Firebaugh [Mon, 25 Nov 2013 21:49:47 +0000 (13:49 -0800)]
Fix accumulation of parameters in edit link
John Firebaugh [Mon, 25 Nov 2013 21:35:06 +0000 (13:35 -0800)]
Fix scroll bar issue on edit pages
John Firebaugh [Mon, 25 Nov 2013 21:20:48 +0000 (13:20 -0800)]
Make main page flash messages visible
Tom Hughes [Mon, 25 Nov 2013 21:13:40 +0000 (21:13 +0000)]
There are four methods, not three
Tom Hughes [Mon, 25 Nov 2013 21:10:56 +0000 (21:10 +0000)]
Add test for redirect routes
John Firebaugh [Mon, 25 Nov 2013 21:12:04 +0000 (13:12 -0800)]
Add explanatory comment
John Firebaugh [Mon, 25 Nov 2013 21:08:24 +0000 (13:08 -0800)]
Document/clarify OSM.Router use
Tom Hughes [Mon, 25 Nov 2013 20:41:25 +0000 (20:41 +0000)]
Revert "Remove redundant code"
This reverts commit
28530085fb94e23b55cc6277dc6e15fdd3cc8a46 .
Aaron Lidman [Mon, 25 Nov 2013 20:27:52 +0000 (12:27 -0800)]
Sort changesets by id rather than created_at, closes #87
Aaron Lidman [Mon, 25 Nov 2013 20:04:22 +0000 (12:04 -0800)]
Fix border-bottom for browse#note, closes #88
Tom Hughes [Mon, 25 Nov 2013 19:14:52 +0000 (19:14 +0000)]
Remove unneessary return added accidentally
Tom Hughes [Mon, 25 Nov 2013 19:03:35 +0000 (19:03 +0000)]
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.
Tom Hughes [Mon, 25 Nov 2013 00:51:53 +0000 (00:51 +0000)]
Remove unused partials
Tom Hughes [Sun, 24 Nov 2013 17:05:02 +0000 (17:05 +0000)]
Enable oauth for geocoder#search
Tom Hughes [Sun, 24 Nov 2013 17:02:38 +0000 (17:02 +0000)]
Block max_id for changeset feeds instead of page which is no longer used
Tom Hughes [Sun, 24 Nov 2013 16:55:56 +0000 (16:55 +0000)]
Format browse page titles in a consistent way
Tom Hughes [Sun, 24 Nov 2013 16:45:45 +0000 (16:45 +0000)]
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.
Tom Hughes [Sun, 24 Nov 2013 16:42:43 +0000 (16:42 +0000)]
Drop ejs as we aren't using it anymore
Tom Hughes [Sun, 24 Nov 2013 16:38:53 +0000 (16:38 +0000)]
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.
Tom Hughes [Sun, 24 Nov 2013 15:29:38 +0000 (15:29 +0000)]
Make sure all pages using the map layout call require_oauth
Tom Hughes [Sun, 24 Nov 2013 12:13:02 +0000 (12:13 +0000)]
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.
John Firebaugh [Sat, 23 Nov 2013 00:52:04 +0000 (16:52 -0800)]
Update to iD v1.3.3
John Firebaugh [Fri, 22 Nov 2013 20:58:09 +0000 (12:58 -0800)]
Compromise on fonts to look better on Windows
John Firebaugh [Fri, 22 Nov 2013 20:29:45 +0000 (12:29 -0800)]
Tweak welcome text
John Firebaugh [Fri, 22 Nov 2013 20:13:12 +0000 (12:13 -0800)]
Restore prev/next changeset by user links
John Firebaugh [Fri, 22 Nov 2013 18:57:07 +0000 (10:57 -0800)]
Pass along gpx parameter to iD
See https://github.com/systemed/iD/issues/1965
John Firebaugh [Thu, 21 Nov 2013 19:31:58 +0000 (11:31 -0800)]
Use machine-readable lat/lon format
Marco Antonio Frias Butrón [Thu, 21 Nov 2013 06:26:17 +0000 (02:26 -0400)]
Fix hidden text behind the search icon
Siebrand Mazeland [Thu, 21 Nov 2013 06:52:31 +0000 (06:52 +0000)]
Localisation updates from http://translatewiki.net.
Aaron Lidman [Wed, 20 Nov 2013 21:44:40 +0000 (13:44 -0800)]
Hide note overflow
Mostly for long links from craigslist notes.
Aaron Lidman [Wed, 20 Nov 2013 21:31:05 +0000 (13:31 -0800)]
Add coordinate detail to node pages
Aaron Lidman [Wed, 20 Nov 2013 20:37:57 +0000 (12:37 -0800)]
Nominatim results zoom to the result location
Aaron Lidman [Wed, 20 Nov 2013 19:43:31 +0000 (11:43 -0800)]
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
John Firebaugh [Tue, 19 Nov 2013 23:02:31 +0000 (15:02 -0800)]
Sign Up -> Start Mapping
John Firebaugh [Tue, 19 Nov 2013 22:59:25 +0000 (14:59 -0800)]
Logout -> Log Out
John Firebaugh [Tue, 19 Nov 2013 20:10:00 +0000 (12:10 -0800)]
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.
Aaron Lidman [Tue, 19 Nov 2013 19:57:30 +0000 (11:57 -0800)]
Improved export warning, removed heading
John Firebaugh [Tue, 19 Nov 2013 19:45:49 +0000 (11:45 -0800)]
Revert padding; fixes header baseline
John Firebaugh [Tue, 19 Nov 2013 19:18:11 +0000 (11:18 -0800)]
Eliminate loading flash for welcome overlay
John Firebaugh [Fri, 15 Nov 2013 23:36:54 +0000 (15:36 -0800)]
Fix test failures
John Firebaugh [Tue, 19 Nov 2013 17:42:47 +0000 (09:42 -0800)]
Merge branch 'master' into redesign
Conflicts:
vendor/assets/leaflet/leaflet.hash.js
vendor/assets/leaflet/leaflet.js
Siebrand Mazeland [Tue, 19 Nov 2013 06:57:29 +0000 (06:57 +0000)]
Localisation updates from http://translatewiki.net.
Aaron Lidman [Tue, 19 Nov 2013 03:11:01 +0000 (19:11 -0800)]
Improved export filter tool
Aaron Lidman [Tue, 19 Nov 2013 02:44:48 +0000 (18:44 -0800)]
Fixed export filter
John Firebaugh [Tue, 19 Nov 2013 02:04:05 +0000 (18:04 -0800)]
Shorten intro text
Aaron Lidman [Tue, 19 Nov 2013 01:29:55 +0000 (17:29 -0800)]
Improvements to changeset bbox styling
Aaron Lidman [Tue, 19 Nov 2013 00:41:25 +0000 (16:41 -0800)]
Wrap bounds of changeset request, closes #72
Aaron Lidman [Tue, 19 Nov 2013 00:24:52 +0000 (16:24 -0800)]
Increase sidebar width, back to 350px
Aaron Lidman [Tue, 19 Nov 2013 00:24:25 +0000 (16:24 -0800)]
Reorder changeset detail lists
Nodes, ways, relations -> Ways, relations, nodes
Aaron Lidman [Tue, 19 Nov 2013 00:02:48 +0000 (16:02 -0800)]
Better spaced changeset lists
Aaron Lidman [Mon, 18 Nov 2013 23:23:48 +0000 (15:23 -0800)]
Improve changeset detail display
Aaron Lidman [Mon, 18 Nov 2013 19:43:48 +0000 (11:43 -0800)]
Fix new note wrapping
Aaron Lidman [Mon, 18 Nov 2013 19:26:43 +0000 (11:26 -0800)]
Adjust header sizing
Aaron Lidman [Mon, 18 Nov 2013 17:56:03 +0000 (09:56 -0800)]
Fix welcome page redirect, closed #70
Tom Hughes [Mon, 18 Nov 2013 17:41:33 +0000 (17:41 +0000)]
Update to latest leaflet-locationfilter plugin
Tom Hughes [Mon, 18 Nov 2013 17:38:06 +0000 (17:38 +0000)]
Update to latest leaflet-osm plugin
Tom Hughes [Mon, 18 Nov 2013 17:36:09 +0000 (17:36 +0000)]
Update to latest Leaflet-hash plugin
Tom Hughes [Mon, 18 Nov 2013 17:34:22 +0000 (17:34 +0000)]
Update to Leaflet 0.7
Tom Hughes [Sun, 17 Nov 2013 21:52:04 +0000 (21:52 +0000)]
Remove the _osm_username cookie and session validation logic
This was a temporary hack to workaround issues with sessions getting
mixed up at the time of the rails 3.1 upgrade, but logs indicate that
whatever the original problem was it is no longer occurring.
John Firebaugh [Sat, 16 Nov 2013 00:47:49 +0000 (16:47 -0800)]
Merge branch 'master' into redesign
Conflicts:
app/controllers/browse_controller.rb
app/views/layouts/_head.html.erb
config/environments/production.rb
config/routes.rb
Aaron Lidman [Sat, 16 Nov 2013 00:11:44 +0000 (16:11 -0800)]
Replace searching.gif with loader from iD
Aaron Lidman [Fri, 15 Nov 2013 23:48:11 +0000 (15:48 -0800)]
Don't render the user menu for users without ids, closed #68
John Firebaugh [Fri, 15 Nov 2013 23:28:25 +0000 (15:28 -0800)]
Revert user page to full width for now
Aaron Lidman [Fri, 15 Nov 2013 23:06:36 +0000 (15:06 -0800)]
Improved noteLayer and dataLayer availability, closes #65
John Firebaugh [Fri, 15 Nov 2013 23:04:46 +0000 (15:04 -0800)]
Adjustments to about page and welcome copy
Aaron Lidman [Fri, 15 Nov 2013 19:26:36 +0000 (11:26 -0800)]
Hide control tooltips on #map-ui expansion, closes #55
Aaron Lidman [Fri, 15 Nov 2013 19:13:16 +0000 (11:13 -0800)]
Hide welcome section on help page if not logged in
closes #67
Tom Hughes [Fri, 15 Nov 2013 19:01:33 +0000 (19:01 +0000)]
Make the link from site#help to site#welcome use a relative URL
Tom Hughes [Fri, 15 Nov 2013 18:51:09 +0000 (18:51 +0000)]
Use <h1> for the title of site#welcome to match other pages
John Firebaugh [Fri, 15 Nov 2013 18:37:27 +0000 (10:37 -0800)]
Use html5shiv for IE8 compatibility
John Firebaugh [Fri, 15 Nov 2013 18:32:14 +0000 (10:32 -0800)]
Revert "Eliminate HTML5 elements"
This led to a huge mess of conflicting CSS rule priorities.
This reverts commit
9fc8bc93684cbcd334c9290240262cf98202cd1e .
Aaron Lidman [Fri, 15 Nov 2013 02:16:23 +0000 (18:16 -0800)]
Obey the hash
John Firebaugh [Fri, 15 Nov 2013 02:07:33 +0000 (18:07 -0800)]
Update to iD v1.3.2
Aaron Lidman [Fri, 15 Nov 2013 01:41:12 +0000 (17:41 -0800)]
No hash on browse pages, closes #35
John Firebaugh [Thu, 14 Nov 2013 23:38:28 +0000 (15:38 -0800)]
Eliminate HTML5 elements
IE8, *sigh*
Aaron Lidman [Thu, 14 Nov 2013 20:40:50 +0000 (12:40 -0800)]
Fixed border consistency
John Firebaugh [Thu, 14 Nov 2013 20:26:58 +0000 (12:26 -0800)]
Expose more router functions
John Firebaugh [Thu, 14 Nov 2013 20:22:20 +0000 (12:22 -0800)]
Simplify
John Firebaugh [Thu, 14 Nov 2013 18:33:32 +0000 (10:33 -0800)]
Drop pngfix.js
Don't need to support IE 6 anymore (<0.2% of users).
John Firebaugh [Thu, 14 Nov 2013 18:17:27 +0000 (10:17 -0800)]
Add X-UA-Compatible meta tag
Rails 4 removed the `BestStandardsSupport` middleware, because
supposedly a HTML5 doctype accomplishes the same thing. But not
quite -- without X-UA-Compatible, the UI for changing compatibility
mode is still visible, and users can get themselves into a bad state
(see https://github.com/openstreetmap/openstreetmap-website/pull/498#issuecomment-
28483550 )
Aaron Lidman [Thu, 14 Nov 2013 17:57:48 +0000 (09:57 -0800)]
Fixed note creation halo to update on dragging
Aaron Lidman [Thu, 14 Nov 2013 17:28:38 +0000 (09:28 -0800)]
Fix #map-ui tooltip styling
Aaron Lidman [Thu, 14 Nov 2013 17:12:39 +0000 (09:12 -0800)]
Fix disabled overlay layers translations
Aaron Lidman [Thu, 14 Nov 2013 01:30:07 +0000 (17:30 -0800)]
Disable overlay layers at minZoom and add tooltips
John Firebaugh [Thu, 14 Nov 2013 00:01:54 +0000 (16:01 -0800)]
Don't set state if it doesn't exist
John Firebaugh [Wed, 13 Nov 2013 23:59:46 +0000 (15:59 -0800)]
Border between history entries
John Firebaugh [Wed, 13 Nov 2013 23:45:07 +0000 (15:45 -0800)]
Fix history sidebar