]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoTest user#set_status
Tom Hughes [Tue, 15 Oct 2013 20:39:07 +0000 (21:39 +0100)]
Test user#set_status

11 years agoFix server error when user#reset_password called with no token
Tom Hughes [Tue, 15 Oct 2013 20:27:39 +0000 (21:27 +0100)]
Fix server error when user#reset_password called with no token

11 years agoTest user#reset_password
Tom Hughes [Tue, 15 Oct 2013 20:27:25 +0000 (21:27 +0100)]
Test user#reset_password

11 years agoTest user#go_public
Tom Hughes [Tue, 15 Oct 2013 20:14:08 +0000 (21:14 +0100)]
Test user#go_public

11 years agoRestore raw latlon search result
John Firebaugh [Tue, 15 Oct 2013 15:14:51 +0000 (11:14 -0400)]
Restore raw latlon search result

11 years agoAdd more tests for hidden diary entries and comments
Tom Hughes [Tue, 15 Oct 2013 18:16:33 +0000 (19:16 +0100)]
Add more tests for hidden diary entries and comments

11 years agoAdd tests for diary_entry#comments
Tom Hughes [Tue, 15 Oct 2013 17:24:51 +0000 (18:24 +0100)]
Add tests for diary_entry#comments

11 years agoFix bogus redirect on error
Tom Hughes [Tue, 15 Oct 2013 17:18:49 +0000 (18:18 +0100)]
Fix bogus redirect on error

11 years agoAdd tests for diary_entry#hide and diary_entry#hidecomment
Tom Hughes [Tue, 15 Oct 2013 17:09:39 +0000 (18:09 +0100)]
Add tests for diary_entry#hide and diary_entry#hidecomment

11 years agoMonkey patch composite_primary_keys to fix deletes via has_many
Tom Hughes [Mon, 14 Oct 2013 23:17:39 +0000 (00:17 +0100)]
Monkey patch composite_primary_keys to fix deletes via has_many

https://github.com/composite-primary-keys/composite_primary_keys/pull/170

11 years agoTidy up trace#edit and trace#delete and make them more consistent
Tom Hughes [Mon, 14 Oct 2013 23:16:53 +0000 (00:16 +0100)]
Tidy up trace#edit and trace#delete and make them more consistent

11 years agoAdd tests for trace#delete
Tom Hughes [Mon, 14 Oct 2013 23:12:40 +0000 (00:12 +0100)]
Add tests for trace#delete

11 years agoAdd tests for trace#edit
Tom Hughes [Mon, 14 Oct 2013 23:08:24 +0000 (00:08 +0100)]
Add tests for trace#edit

11 years agoAdd some tests for trace#view
Tom Hughes [Sun, 13 Oct 2013 21:46:44 +0000 (22:46 +0100)]
Add some tests for trace#view

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 14 Oct 2013 09:14:40 +0000 (09:14 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoFix export location filter button
John Firebaugh [Wed, 9 Oct 2013 00:24:49 +0000 (17:24 -0700)]
Fix export location filter button

Upstream pull request:
https://github.com/kajic/leaflet-locationfilter/pull/14

11 years agoDon't try to route external URLs
John Firebaugh [Tue, 8 Oct 2013 23:52:53 +0000 (16:52 -0700)]
Don't try to route external URLs

11 years agoTrimming small style
John Firebaugh [Wed, 31 Jul 2013 18:46:32 +0000 (11:46 -0700)]
Trimming small style

11 years agoWork towards integrating data overlay and browse pages
John Firebaugh [Sat, 5 Oct 2013 00:00:44 +0000 (17:00 -0700)]
Work towards integrating data overlay and browse pages

11 years agoAJAXy changeset history
John Firebaugh [Mon, 7 Oct 2013 23:14:18 +0000 (16:14 -0700)]
AJAXy changeset history

11 years agoRestore previous map state on popstate
John Firebaugh [Tue, 8 Oct 2013 22:54:07 +0000 (15:54 -0700)]
Restore previous map state on popstate

11 years agoFix click on search result
John Firebaugh [Tue, 8 Oct 2013 00:15:16 +0000 (17:15 -0700)]
Fix click on search result

11 years agoConsolidate search-related JavaScript
John Firebaugh [Tue, 8 Oct 2013 00:15:04 +0000 (17:15 -0700)]
Consolidate search-related JavaScript

11 years agoDon't route clicks on the dropdown menus
John Firebaugh [Mon, 7 Oct 2013 23:35:39 +0000 (16:35 -0700)]
Don't route clicks on the dropdown menus

11 years agoFix edit page
John Firebaugh [Mon, 7 Oct 2013 22:24:50 +0000 (15:24 -0700)]
Fix edit page

11 years agoImplement closing sidebar
John Firebaugh [Sat, 5 Oct 2013 00:49:18 +0000 (17:49 -0700)]
Implement closing sidebar

11 years agoRender flash in sidebar
John Firebaugh [Sat, 5 Oct 2013 00:34:06 +0000 (17:34 -0700)]
Render flash in sidebar

11 years agoRefactor browsed object loading
John Firebaugh [Fri, 4 Oct 2013 21:37:22 +0000 (14:37 -0700)]
Refactor browsed object loading

11 years agoPrecompile about.js
John Firebaugh [Fri, 4 Oct 2013 22:45:56 +0000 (15:45 -0700)]
Precompile about.js

11 years agoConsolidate layer initialization
John Firebaugh [Fri, 4 Oct 2013 22:20:08 +0000 (15:20 -0700)]
Consolidate layer initialization

11 years agoConvert search to pushState
John Firebaugh [Fri, 4 Oct 2013 21:24:25 +0000 (14:24 -0700)]
Convert search to pushState

11 years agoFix root link
John Firebaugh [Fri, 4 Oct 2013 20:25:11 +0000 (13:25 -0700)]
Fix root link

11 years agoDon't rely on body classes so much
John Firebaugh [Fri, 4 Oct 2013 18:36:53 +0000 (11:36 -0700)]
Don't rely on body classes so much

Doesn't work well with pushState-based navigation.

11 years agopushState based navigation between map-based layouts
John Firebaugh [Wed, 2 Oct 2013 23:41:44 +0000 (16:41 -0700)]
pushState based navigation between map-based layouts

11 years agoOrganize CSS better
John Firebaugh [Fri, 4 Oct 2013 18:26:14 +0000 (11:26 -0700)]
Organize CSS better

11 years agoAdd layout-based class to body
John Firebaugh [Fri, 4 Oct 2013 17:57:54 +0000 (10:57 -0700)]
Add layout-based class to body

11 years agoEliminate edit.js
John Firebaugh [Thu, 3 Oct 2013 23:56:48 +0000 (16:56 -0700)]
Eliminate edit.js

11 years agoEliminate separate browse.css asset
John Firebaugh [Thu, 3 Oct 2013 23:53:04 +0000 (16:53 -0700)]
Eliminate separate browse.css asset

11 years agoSimplify layouting
John Firebaugh [Thu, 3 Oct 2013 21:10:21 +0000 (14:10 -0700)]
Simplify layouting

11 years agoFix missing translation
John Firebaugh [Wed, 2 Oct 2013 23:41:38 +0000 (16:41 -0700)]
Fix missing translation

11 years agoSimplify geolink-related code
John Firebaugh [Wed, 2 Oct 2013 21:46:00 +0000 (14:46 -0700)]
Simplify geolink-related code

#zoom/lat/lon hash format is now used consistently.

11 years agoFix "Edit" button when browsing features
John Firebaugh [Wed, 2 Oct 2013 21:31:04 +0000 (14:31 -0700)]
Fix "Edit" button when browsing features

11 years agoDon't disable History button
John Firebaugh [Wed, 2 Oct 2013 21:16:42 +0000 (14:16 -0700)]
Don't disable History button

11 years agoClean up
John Firebaugh [Wed, 2 Oct 2013 21:10:20 +0000 (14:10 -0700)]
Clean up

11 years agoContent style adjustments
John Firebaugh [Wed, 2 Oct 2013 20:32:17 +0000 (13:32 -0700)]
Content style adjustments

11 years agoRemove unused
John Firebaugh [Wed, 2 Oct 2013 20:20:58 +0000 (13:20 -0700)]
Remove unused

11 years agoAdd current state to all nav elements
John Firebaugh [Wed, 2 Oct 2013 18:52:56 +0000 (11:52 -0700)]
Add current state to all nav elements

11 years agoDon't autofocus search, fade out "Where am I?" on focus
John Firebaugh [Wed, 2 Oct 2013 18:22:56 +0000 (11:22 -0700)]
Don't autofocus search, fade out "Where am I?" on focus

11 years agoRemove unused
John Firebaugh [Wed, 2 Oct 2013 18:17:55 +0000 (11:17 -0700)]
Remove unused

11 years agoRestore "Where am I?"
John Firebaugh [Wed, 2 Oct 2013 18:14:31 +0000 (11:14 -0700)]
Restore "Where am I?"

11 years agoFactor javascript include tag to layout
John Firebaugh [Wed, 2 Oct 2013 18:03:20 +0000 (11:03 -0700)]
Factor javascript include tag to layout

11 years agoRefine header
John Firebaugh [Wed, 2 Oct 2013 17:50:00 +0000 (10:50 -0700)]
Refine header

11 years agoRemove unused
John Firebaugh [Wed, 2 Oct 2013 17:37:04 +0000 (10:37 -0700)]
Remove unused

11 years agoRemove edit links
John Firebaugh [Wed, 2 Oct 2013 00:33:43 +0000 (17:33 -0700)]
Remove edit links

11 years agoRefine user menu CSS
John Firebaugh [Wed, 2 Oct 2013 00:06:28 +0000 (17:06 -0700)]
Refine user menu CSS

11 years agoInline edit menu partial, refine CSS
John Firebaugh [Tue, 1 Oct 2013 23:33:43 +0000 (16:33 -0700)]
Inline edit menu partial, refine CSS

11 years agoAdd about page
John Firebaugh [Tue, 1 Oct 2013 20:52:58 +0000 (13:52 -0700)]
Add about page

11 years agoFixes
John Firebaugh [Tue, 1 Oct 2013 00:51:46 +0000 (17:51 -0700)]
Fixes

11 years agoRemove unused bounds parameters
John Firebaugh [Sun, 29 Sep 2013 23:19:29 +0000 (16:19 -0700)]
Remove unused bounds parameters

These were used by "View on larger map" links,
which no longer exist.

11 years agoWork on changeset display
John Firebaugh [Sun, 29 Sep 2013 23:15:13 +0000 (16:15 -0700)]
Work on changeset display

11 years agoClean up search CSS
John Firebaugh [Sun, 29 Sep 2013 22:51:29 +0000 (15:51 -0700)]
Clean up search CSS

11 years agoFixes
John Firebaugh [Sun, 29 Sep 2013 22:45:18 +0000 (15:45 -0700)]
Fixes

11 years agoFix display of browsed objects on map
John Firebaugh [Sat, 28 Sep 2013 22:59:48 +0000 (15:59 -0700)]
Fix display of browsed objects on map

11 years agoRedirect ?node=n and similar to browse pages
John Firebaugh [Sat, 28 Sep 2013 22:02:36 +0000 (15:02 -0700)]
Redirect ?node=n and similar to browse pages

11 years agoConvert browse details to sidebar layout
John Firebaugh [Sat, 28 Sep 2013 01:09:34 +0000 (18:09 -0700)]
Convert browse details to sidebar layout

11 years agoConvert history page to sidebar layout
John Firebaugh [Sat, 28 Sep 2013 01:05:47 +0000 (18:05 -0700)]
Convert history page to sidebar layout

11 years agoSidebar work
John Firebaugh [Sat, 28 Sep 2013 01:02:50 +0000 (18:02 -0700)]
Sidebar work

11 years agoFrontpage redesign
John Firebaugh [Tue, 9 Jul 2013 22:26:04 +0000 (15:26 -0700)]
Frontpage redesign

11 years agoRemove LearnOSM
John Firebaugh [Fri, 27 Sep 2013 19:08:57 +0000 (12:08 -0700)]
Remove LearnOSM

11 years agoAdjust header layout for user menu
John Firebaugh [Fri, 27 Sep 2013 19:07:29 +0000 (12:07 -0700)]
Adjust header layout for user menu

11 years agoLink to help page from welcome
John Firebaugh [Sun, 18 Aug 2013 15:24:57 +0000 (08:24 -0700)]
Link to help page from welcome

11 years agoStyle
John Firebaugh [Thu, 8 Aug 2013 00:19:19 +0000 (17:19 -0700)]
Style

11 years agoadjustments to help page + better copy
Saman Bemel-Benrud [Wed, 31 Jul 2013 18:53:01 +0000 (14:53 -0400)]
adjustments to help page + better copy

11 years agoAdd help page
John Firebaugh [Tue, 16 Jul 2013 22:59:09 +0000 (15:59 -0700)]
Add help page

11 years agoUse reverse geocoders for any lat/lon queries
John Firebaugh [Wed, 9 Oct 2013 17:06:28 +0000 (10:06 -0700)]
Use reverse geocoders for any lat/lon queries

This simplifies the implementation, allows code sharing with
"Where am I?", and produces friendlier results for lat/lon
searches (actual reverse geocode results rather than a raw
lat/lon display).

11 years agoRemove vestigial routes
John Firebaugh [Wed, 9 Oct 2013 16:52:56 +0000 (09:52 -0700)]
Remove vestigial routes

Namefinder support was removed in 1a0728ec7b46efdaf3cf9455f288f08ecd465d2b.

11 years agoRemove never actually used code from five years ago
Tom Hughes [Fri, 11 Oct 2013 19:03:06 +0000 (20:03 +0100)]
Remove never actually used code from five years ago

11 years agoFix url to documentation of db setup
Simon Legner [Thu, 3 Oct 2013 18:42:33 +0000 (20:42 +0200)]
Fix url to documentation of db setup

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 7 Oct 2013 20:23:48 +0000 (20:23 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUpdate rails-i18n
Tom Hughes [Sat, 5 Oct 2013 09:44:30 +0000 (10:44 +0100)]
Update rails-i18n

11 years agoUse uniform abbreviations for CC licenses
Paul Norman [Wed, 2 Oct 2013 08:54:57 +0000 (01:54 -0700)]
Use uniform abbreviations for CC licenses

11 years agoLog details of any signup requests blocked by an ACL
Tom Hughes [Wed, 2 Oct 2013 16:56:23 +0000 (17:56 +0100)]
Log details of any signup requests blocked by an ACL

11 years agoImprove behaviour of browse pages when no bounding box is available
Tom Hughes [Tue, 1 Oct 2013 21:46:16 +0000 (22:46 +0100)]
Improve behaviour of browse pages when no bounding box is available

11 years agoAdding internationalization in links share and layers.
Omar Vega [Sun, 29 Sep 2013 16:36:18 +0000 (11:36 -0500)]
Adding internationalization in links share and layers.

11 years agoUpdate to iD v1.2.1
John Firebaugh [Tue, 1 Oct 2013 00:19:36 +0000 (17:19 -0700)]
Update to iD v1.2.1

11 years agoAdd a basic test for browse#note
Tom Hughes [Tue, 1 Oct 2013 18:34:36 +0000 (19:34 +0100)]
Add a basic test for browse#note

11 years agoImprove consistency of selections in the browser controller
Tom Hughes [Mon, 30 Sep 2013 07:45:19 +0000 (08:45 +0100)]
Improve consistency of selections in the browser controller

11 years agoFix typo
Tom Hughes [Mon, 30 Sep 2013 07:35:34 +0000 (08:35 +0100)]
Fix typo

11 years agoConvert some deprecated methods to modern arel syntax
Tom Hughes [Sun, 29 Sep 2013 21:50:01 +0000 (22:50 +0100)]
Convert some deprecated methods to modern arel syntax

11 years agoConvert trace counting to use modern arel methods
Tom Hughes [Sun, 29 Sep 2013 21:33:04 +0000 (22:33 +0100)]
Convert trace counting to use modern arel methods

11 years agoDon't redirect from user#terms to login if the user is logged in
Tom Hughes [Sun, 29 Sep 2013 14:43:34 +0000 (15:43 +0100)]
Don't redirect from user#terms to login if the user is logged in

11 years agoMake sure the "terms seen" tests actually run
Tom Hughes [Sun, 29 Sep 2013 14:43:16 +0000 (15:43 +0100)]
Make sure the "terms seen" tests actually run

11 years agoUpdate to iD v1.2.0
John Firebaugh [Thu, 26 Sep 2013 17:21:36 +0000 (10:21 -0700)]
Update to iD v1.2.0

11 years agoAdd glow to search box
Nicholas Ingalls [Tue, 24 Sep 2013 22:21:44 +0000 (19:21 -0300)]
Add glow to search box

11 years agoUpdate install instructions - ruby 1.9 is now required
Dan Stowell [Tue, 17 Sep 2013 06:48:30 +0000 (07:48 +0100)]
Update install instructions - ruby 1.9 is now required

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Thu, 26 Sep 2013 13:20:55 +0000 (13:20 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUpgrade to http_accept_language 2.x
Tom Hughes [Tue, 24 Sep 2013 19:22:44 +0000 (20:22 +0100)]
Upgrade to http_accept_language 2.x

11 years agoRemove debugging code
Tom Hughes [Tue, 24 Sep 2013 16:14:40 +0000 (17:14 +0100)]
Remove debugging code

11 years agoRevert back to the upstream oauth-plugin
Tom Hughes [Tue, 24 Sep 2013 14:40:38 +0000 (15:40 +0100)]
Revert back to the upstream oauth-plugin

11 years agoUse image_url instead of nasty hacks
Tom Hughes [Tue, 24 Sep 2013 09:46:32 +0000 (10:46 +0100)]
Use image_url instead of nasty hacks