]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Wed, 29 Aug 2012 08:01:32 +0000 (09:01 +0100)]
Switch to the HTML5 DOCTYPE
Tom Hughes [Wed, 29 Aug 2012 11:29:47 +0000 (12:29 +0100)]
Use augment.js for improved cross browser compatibility
Remove the quick hack for that I added for Array.forEach and pull
in augment.js instead to add missing JS methods to older browsers.
Tom Hughes [Wed, 29 Aug 2012 08:29:51 +0000 (09:29 +0100)]
Implement Array.forEach for browsers which don't have it
Tom Hughes [Tue, 28 Aug 2012 19:39:18 +0000 (20:39 +0100)]
Move a chunk of non-markup ruby code from a view to the controller
Tom Hughes [Tue, 28 Aug 2012 18:47:20 +0000 (19:47 +0100)]
Move some javascript from the layout to application.js
Tom Hughes [Tue, 28 Aug 2012 10:53:16 +0000 (11:53 +0100)]
Potlatch 2 localisation updates
Siebrand Mazeland [Tue, 28 Aug 2012 10:01:13 +0000 (10:01 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Mon, 27 Aug 2012 21:54:04 +0000 (22:54 +0100)]
Update the image size when we switch to the mapnik export format
Tom Hughes [Mon, 27 Aug 2012 20:18:07 +0000 (21:18 +0100)]
Use start.html.erb views instead of _sidebar.html.erb partials
John Firebaugh [Sun, 26 Aug 2012 23:36:05 +0000 (16:36 -0700)]
Avoid polluting the global scope
Only startBrowse and startExport need to be exposed;
everything else can be scoped inside those functions.
John Firebaugh [Sun, 26 Aug 2012 02:41:18 +0000 (19:41 -0700)]
Use a standard application.js bundle
Include map.js and menu.js in the bundle.
John Firebaugh [Sun, 26 Aug 2012 02:31:52 +0000 (19:31 -0700)]
Remove unused helper
John Firebaugh [Sun, 26 Aug 2012 02:30:51 +0000 (19:30 -0700)]
Remove unused gem and add a comment where it was replaced
John Firebaugh [Sun, 26 Aug 2012 02:27:10 +0000 (19:27 -0700)]
Extract browse.js static asset
John Firebaugh [Sun, 26 Aug 2012 02:18:31 +0000 (19:18 -0700)]
Reduce interpolation in browse/start.js.erb
John Firebaugh [Sun, 26 Aug 2012 01:40:37 +0000 (18:40 -0700)]
Extract export.js static asset
John Firebaugh [Sun, 26 Aug 2012 01:21:14 +0000 (18:21 -0700)]
Reduce interpolation in export/start.js.erb
Tom Hughes [Fri, 24 Feb 2012 23:21:09 +0000 (23:21 +0000)]
Switch to using i18n-js for handling translations in javascript
Siebrand Mazeland [Sat, 25 Aug 2012 21:24:42 +0000 (21:24 +0000)]
Localisation updates from http://translatewiki.net.
Alex Barth [Sat, 25 Aug 2012 03:16:19 +0000 (23:16 -0400)]
Float user image to right correctly on per-user diary listing page
John Firebaugh [Sat, 25 Aug 2012 02:00:59 +0000 (19:00 -0700)]
Set OpenLayers lang unobtrusively
We output the locale code as the lang attribute, so
use that rather than interpolating into embedded JS.
Tom Hughes [Wed, 22 Aug 2012 21:52:27 +0000 (22:52 +0100)]
Update Potlatch 2 to
2.3-443-g151b833 build
Tom Hughes [Wed, 22 Aug 2012 20:36:58 +0000 (21:36 +0100)]
Add an entry to the edit menu for turning on the notes layer
Tom Hughes [Wed, 22 Aug 2012 20:29:16 +0000 (21:29 +0100)]
Add OpenLayers.Format.QueryStringFilter to the OpenLayers build
Tom Hughes [Wed, 22 Aug 2012 19:52:08 +0000 (20:52 +0100)]
Merge branch 'master' into openstreetbugs
Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/openlayers.cfg
db/structure.sql
vendor/assets/openlayers/OpenLayers.js
Tom Hughes [Mon, 12 Mar 2012 18:43:14 +0000 (18:43 +0000)]
Start rewriting the notes layer for the front page
Tom MacWright [Tue, 21 Aug 2012 16:12:25 +0000 (12:12 -0400)]
Revise SOTM logo design
Tom Hughes [Mon, 20 Aug 2012 20:29:56 +0000 (21:29 +0100)]
Potlatch 2 localisation updates
Siebrand Mazeland [Sun, 19 Aug 2012 16:18:23 +0000 (16:18 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Sun, 19 Aug 2012 15:55:29 +0000 (16:55 +0100)]
Rework sidebar width calculation to work with jQuery 1.8
Tom Hughes [Fri, 17 Aug 2012 21:57:58 +0000 (22:57 +0100)]
Update tests for changes to HTML escaping in rails 3.2.8
Tom Hughes [Fri, 17 Aug 2012 21:40:52 +0000 (22:40 +0100)]
Update rails to 3.2.8
Tom Hughes [Wed, 15 Aug 2012 21:09:36 +0000 (22:09 +0100)]
Test the links in the menu of the user view page
Tom Hughes [Wed, 15 Aug 2012 21:09:23 +0000 (22:09 +0100)]
Add a missing </tr> tag
Tom Hughes [Wed, 15 Aug 2012 20:41:29 +0000 (21:41 +0100)]
Add tests for make_friend and remove_friend
Tom Hughes [Wed, 15 Aug 2012 18:48:06 +0000 (19:48 +0100)]
Fixup make_friend and remove_friend properly
Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.
Tom Hughes [Wed, 15 Aug 2012 18:22:53 +0000 (19:22 +0100)]
Update Potlatch 2 to
2.3-438-g86fce48 build
Tom Hughes [Wed, 15 Aug 2012 18:04:40 +0000 (19:04 +0100)]
Reposition the zoom slider after recreating the SimplePanZoom control
Tom MacWright [Tue, 14 Aug 2012 18:53:51 +0000 (14:53 -0400)]
Fix regression - no link to view diary of other users
Tom Hughes [Tue, 14 Aug 2012 21:56:28 +0000 (22:56 +0100)]
Fix incorrect interpolation variables
Tom Hughes [Tue, 14 Aug 2012 21:49:07 +0000 (22:49 +0100)]
Require POST for make_friend and remove_friend
Note that this breaks the make_friend link in friend notfication
emails, but it will do as a temporary measure.
Siebrand Mazeland [Sun, 12 Aug 2012 18:25:26 +0000 (18:25 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Sun, 12 Aug 2012 15:14:35 +0000 (16:14 +0100)]
Move some helper functions to better homes
Tom Hughes [Sun, 12 Aug 2012 15:14:00 +0000 (16:14 +0100)]
Remove empty helper files
Tom Hughes [Sat, 11 Aug 2012 09:49:38 +0000 (10:49 +0100)]
Correct API URL shown in data browser sidebar
Tom Hughes [Fri, 10 Aug 2012 11:28:16 +0000 (12:28 +0100)]
Potlatch 2 localisation updates
Tom Hughes [Fri, 10 Aug 2012 11:27:53 +0000 (12:27 +0100)]
Update Potlatch 2 to
2.3-430-g8cee913 build
Tom Hughes [Fri, 10 Aug 2012 07:42:38 +0000 (08:42 +0100)]
Update schema
Tom Hughes [Fri, 10 Aug 2012 07:42:10 +0000 (08:42 +0100)]
Fix incorrect interpolation variable
Tom Hughes [Thu, 9 Aug 2012 09:48:34 +0000 (10:48 +0100)]
Improve blocks on/by links on user pages
All block related links are now only shown if the user has given
or received any blocks, and include a count of active blocks.
Tom Hughes [Thu, 9 Aug 2012 20:56:04 +0000 (21:56 +0100)]
Fix test failure caused by moving OAuth settings link
Tom MacWright [Tue, 7 Aug 2012 18:35:17 +0000 (14:35 -0400)]
Improve user page navigation menu
Add counts to edits, blocks, and traces; don't show blocks if there
are none; and move OAuth to the settings page.
Siebrand Mazeland [Thu, 9 Aug 2012 14:07:45 +0000 (14:07 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Wed, 8 Aug 2012 23:26:38 +0000 (00:26 +0100)]
Preserve background colour when marking messages read/unread
Tom Hughes [Wed, 8 Aug 2012 20:37:29 +0000 (21:37 +0100)]
Add a SOTM advert to the sidebar
Tom MacWright [Tue, 7 Aug 2012 23:16:52 +0000 (19:16 -0400)]
Improve presentation of homepage
Collapse search button into icon, deemphasize copy and remove
extraneous borders.
Tom Hughes [Wed, 8 Aug 2012 17:08:29 +0000 (18:08 +0100)]
Hide the new layer switcher and zoom controls on printouts
Tom Hughes [Wed, 8 Aug 2012 17:05:57 +0000 (18:05 +0100)]
Hide the SimplePanZoom control on the user page map
Tom Hughes [Wed, 8 Aug 2012 17:00:42 +0000 (18:00 +0100)]
Use SimplePanZoom control in changeset browser maps
Tom Hughes [Tue, 7 Aug 2012 23:37:07 +0000 (00:37 +0100)]
Enable transition support for Firefox and Opera
Tom MacWright [Tue, 7 Aug 2012 20:50:22 +0000 (16:50 -0400)]
Replace standard PanZoomBar control with new SimplePanZoom control
Tom Hughes [Tue, 7 Aug 2012 21:57:13 +0000 (22:57 +0100)]
Make things a bit more readable
Tom MacWright [Tue, 7 Aug 2012 17:03:36 +0000 (13:03 -0400)]
Improve styling of inbox counter in greeting bar
Tom Hughes [Thu, 2 Aug 2012 21:28:55 +0000 (22:28 +0100)]
Update precompile lists for changes to OpenLayers styles
Tom Hughes [Thu, 2 Aug 2012 20:40:12 +0000 (21:40 +0100)]
Break up the "copyright and license" text into smaller pieces
Tom Hughes [Thu, 2 Aug 2012 18:39:48 +0000 (19:39 +0100)]
Fix broken interpolation variables
Tom Hughes [Thu, 2 Aug 2012 18:31:02 +0000 (19:31 +0100)]
Potlatch 2 localisation updates
Tom Hughes [Thu, 2 Aug 2012 18:29:15 +0000 (19:29 +0100)]
Update Potlatch 2 to
2.3-425-g81ca535 build
Tom Hughes [Wed, 1 Aug 2012 20:40:40 +0000 (21:40 +0100)]
Use a custom OpenLayers theme
Instead of having a customised copy of the default theme in the
app assets, use a custom theme that pulls in the default one and
then overrides things as needed.
Tom Hughes [Wed, 1 Aug 2012 11:05:47 +0000 (12:05 +0100)]
Style the CSS zoom control to match the layer switcher
Siebrand Mazeland [Thu, 2 Aug 2012 11:46:01 +0000 (11:46 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Wed, 1 Aug 2012 09:56:19 +0000 (10:56 +0100)]
Improve "no traces" message
Tom Hughes [Wed, 1 Aug 2012 09:55:48 +0000 (10:55 +0100)]
Add paragraph tags around "no edits" message
Steve Singer [Sun, 18 Mar 2012 19:31:07 +0000 (15:31 -0400)]
Replace raw with a translation with the html suffix
Steve Singer [Sun, 18 Mar 2012 19:28:42 +0000 (15:28 -0400)]
Don't show the changeset container or map if there are no changesets
Steve Singer [Sun, 22 Jul 2012 14:41:17 +0000 (10:41 -0400)]
Navigation changes to the GPX traces page
Display a better message when no traces are present and only
display the paging links when multiple pages exist.
Tristen Brown [Sat, 17 Mar 2012 21:08:36 +0000 (17:08 -0400)]
Show a helpful message when there are no changesets to display
Tristen Brown [Sat, 17 Mar 2012 21:07:53 +0000 (17:07 -0400)]
Show a helpful message when there are no traces to display
Tom Hughes [Mon, 30 Jul 2012 12:41:11 +0000 (13:41 +0100)]
Don't try and fix the height of the search box
We have no idea how much space a given browser will need for an input
field so stop pretending we do as we just get it wrong.
Tom Hughes [Mon, 30 Jul 2012 12:35:25 +0000 (13:35 +0100)]
Make links back to the user language copyright page work
Tom Hughes [Sun, 29 Jul 2012 21:24:55 +0000 (22:24 +0100)]
Update Potlatch 2 imagery sources
Tom Hughes [Fri, 27 Jul 2012 20:30:06 +0000 (21:30 +0100)]
Show the correct reconfirm link for OpenID login attempts
Tom Hughes [Fri, 27 Jul 2012 20:27:45 +0000 (21:27 +0100)]
OpenID attributes returned via AX seem to be arrays now
Tom Hughes [Fri, 27 Jul 2012 11:24:44 +0000 (12:24 +0100)]
Replace deprecated update_attribute method
Tom Hughes [Fri, 27 Jul 2012 11:15:55 +0000 (12:15 +0100)]
Update to rails 3.2.7
Tom Hughes [Fri, 27 Jul 2012 11:13:10 +0000 (12:13 +0100)]
Update Potlatch 2 to
2.3-419-gbf71353 build
Tom Hughes [Fri, 27 Jul 2012 10:39:11 +0000 (11:39 +0100)]
Clear pass_crypt_confirmation when encrypting a new password
If we change pass_crypt (by encrypting it) without clearing the
confirmation then the user record becomes invalid.
Tom Hughes [Mon, 23 Jul 2012 11:50:48 +0000 (12:50 +0100)]
Don't allow hash signs in usernames
Tom Hughes [Mon, 23 Jul 2012 09:38:29 +0000 (10:38 +0100)]
Don't allow percent signs in usernames
Tom Hughes [Wed, 18 Jul 2012 20:28:09 +0000 (21:28 +0100)]
Add a paging control to the user blocks list
Sarah Hoffmann [Sat, 14 Jul 2012 14:57:58 +0000 (16:57 +0200)]
Replace PanZoom control with Zoom control for small maps
In OpenLayers 2.12 the event handling of PanZoom and PanZoomBar clashes
with the result that the zoom level changes by two steps every time one
of the zoom buttons is pressed. Using the Zoom control fixes this issue.
Tom Hughes [Fri, 13 Jul 2012 19:00:05 +0000 (20:00 +0100)]
Go back to the normal oauth-plugin now it is fixed
Tom Hughes [Thu, 12 Jul 2012 20:02:18 +0000 (21:02 +0100)]
Update offset for marker icon to accurately position it
Tom Hughes [Thu, 12 Jul 2012 18:49:27 +0000 (19:49 +0100)]
Remove obsolete maxExtent from marker layer
Tom Hughes [Wed, 11 Jul 2012 13:31:47 +0000 (14:31 +0100)]
Present links at the bottom of data browser pages in a consistent way
Andy Allan [Wed, 11 Jul 2012 13:07:50 +0000 (14:07 +0100)]
Don't show coordinates for deleted nodes
Tom Hughes [Sat, 7 Jul 2012 19:40:04 +0000 (20:40 +0100)]
Require ruby-openid 2.2.0 or later for ruby 1.9 support
Tom Hughes [Sat, 7 Jul 2012 19:32:31 +0000 (20:32 +0100)]
Update Potlatch 2 to
2.3-415-g05324af build
Robert Whittaker [Mon, 25 Jun 2012 12:51:33 +0000 (14:51 +0200)]
Add link to Contributors page on wiki from the main OSM copyright page.
Tom Hughes [Tue, 3 Jul 2012 18:08:51 +0000 (19:08 +0100)]
Update Potlatch 2 to
2.3-413-gca0fe9b build