]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoFloat li's to eliminate whitespace between them
John Firebaugh [Wed, 6 Nov 2013 19:28:22 +0000 (11:28 -0800)]
Float li's to eliminate whitespace between them

11 years agoRemove unused about page code
John Firebaugh [Wed, 6 Nov 2013 19:15:08 +0000 (11:15 -0800)]
Remove unused about page code

11 years agoFix merge conflict
John Firebaugh [Wed, 6 Nov 2013 19:09:52 +0000 (11:09 -0800)]
Fix merge conflict

11 years agoHook up 'Learn More' and 'Sign Up' buttons
Aaron Lidman [Wed, 6 Nov 2013 18:24:27 +0000 (10:24 -0800)]
Hook up 'Learn More' and 'Sign Up' buttons

11 years agouser menu fix
Eden Halperin [Wed, 6 Nov 2013 18:17:36 +0000 (13:17 -0500)]
user menu fix

11 years agoresponsive secondary pages and fixed map
Eden Halperin [Wed, 6 Nov 2013 17:57:01 +0000 (12:57 -0500)]
responsive secondary pages and fixed map

11 years agoAdd 'Learn More' and 'Sign Up' buttons
Aaron Lidman [Wed, 6 Nov 2013 17:55:00 +0000 (09:55 -0800)]
Add 'Learn More' and 'Sign Up' buttons

Needs styling

11 years agogroundwork for responsive menu
Eden Halperin [Wed, 6 Nov 2013 15:29:52 +0000 (10:29 -0500)]
groundwork for responsive menu

11 years agoRemove all the headers
Aaron Lidman [Wed, 6 Nov 2013 03:32:33 +0000 (19:32 -0800)]
Remove all the headers

11 years agoChange about page background to match help page
Aaron Lidman [Wed, 6 Nov 2013 02:29:12 +0000 (18:29 -0800)]
Change about page background to match help page

11 years agoImprove changeset template
Aaron Lidman [Wed, 6 Nov 2013 02:28:11 +0000 (18:28 -0800)]
Improve changeset template

11 years agoCommented out background images from about page
Aaron Lidman [Wed, 6 Nov 2013 01:16:28 +0000 (17:16 -0800)]
Commented out background images from about page

11 years agoIterate on layer control item design
John Firebaugh [Wed, 6 Nov 2013 00:46:08 +0000 (16:46 -0800)]
Iterate on layer control item design

11 years agoLink to full-world view for user changeset list
John Firebaugh [Wed, 6 Nov 2013 00:42:12 +0000 (16:42 -0800)]
Link to full-world view for user changeset list

11 years agoAdded hover state to close button
Aaron Lidman [Wed, 6 Nov 2013 00:02:31 +0000 (16:02 -0800)]
Added hover state to close button

11 years agoRestore "Go to Home Location"
John Firebaugh [Wed, 6 Nov 2013 00:00:41 +0000 (16:00 -0800)]
Restore "Go to Home Location"

11 years agoFix map controls on user settings page
John Firebaugh [Tue, 5 Nov 2013 23:57:03 +0000 (15:57 -0800)]
Fix map controls on user settings page

11 years agoMissed a couple close buttons
Aaron Lidman [Tue, 5 Nov 2013 23:15:49 +0000 (15:15 -0800)]
Missed a couple close buttons

11 years agoAdd close icons
Aaron Lidman [Tue, 5 Nov 2013 23:00:45 +0000 (15:00 -0800)]
Add close icons

11 years agobase layers sidebar increased readability
Eden Halperin [Tue, 5 Nov 2013 22:06:18 +0000 (17:06 -0500)]
base layers sidebar increased readability

11 years agoImprove changeset list
Aaron Lidman [Tue, 5 Nov 2013 21:42:32 +0000 (13:42 -0800)]
Improve changeset list

11 years agoMerge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign
Aaron Lidman [Tue, 5 Nov 2013 21:31:50 +0000 (13:31 -0800)]
Merge branch 'redesign' of github.com:osmlab/openstreetmap-website into redesign

11 years agoImprove notes template
Aaron Lidman [Tue, 5 Nov 2013 21:31:41 +0000 (13:31 -0800)]
Improve notes template

11 years agoUse appropriate precision for "Where am I?"
John Firebaugh [Tue, 5 Nov 2013 21:27:18 +0000 (13:27 -0800)]
Use appropriate precision for "Where am I?"

11 years agoGo borderless here too
John Firebaugh [Tue, 5 Nov 2013 21:17:33 +0000 (13:17 -0800)]
Go borderless here too

11 years agoMerge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign
Eden Halperin [Tue, 5 Nov 2013 21:13:04 +0000 (16:13 -0500)]
Merge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign

11 years agofix headers in export sidebar
Eden Halperin [Tue, 5 Nov 2013 21:12:46 +0000 (16:12 -0500)]
fix headers in export sidebar

11 years agoUndo commenting out code
John Firebaugh [Tue, 5 Nov 2013 20:38:41 +0000 (12:38 -0800)]
Undo commenting out code

11 years agotouch up secondary pages and leaflet sidebar content
Eden Halperin [Tue, 5 Nov 2013 18:28:37 +0000 (13:28 -0500)]
touch up secondary pages and leaflet sidebar content

11 years agoLink search results directly to browse pages
John Firebaugh [Tue, 5 Nov 2013 20:26:36 +0000 (12:26 -0800)]
Link search results directly to browse pages

11 years agoImprove pagination
Aaron Lidman [Tue, 5 Nov 2013 20:25:54 +0000 (12:25 -0800)]
Improve pagination

11 years agoFix common details
Aaron Lidman [Tue, 5 Nov 2013 19:57:26 +0000 (11:57 -0800)]
Fix common details

11 years agonarrower sidebar, transparent minimized state, cleaned up search results
Eden Halperin [Tue, 5 Nov 2013 16:37:21 +0000 (11:37 -0500)]
narrower sidebar, transparent minimized state, cleaned up search results

11 years agocleaned up header
Eden Halperin [Mon, 4 Nov 2013 22:56:37 +0000 (17:56 -0500)]
cleaned up header

11 years agoUpdate CONFIGURE.md for Rails 4
John Firebaugh [Tue, 5 Nov 2013 18:05:51 +0000 (10:05 -0800)]
Update CONFIGURE.md for Rails 4

Rails 4 doesn't support a :without_protection => true option.

11 years agoConsistent headers and footers in sidebar
Aaron Lidman [Tue, 5 Nov 2013 18:04:45 +0000 (10:04 -0800)]
Consistent headers and footers in sidebar

11 years agoSimplified common details
Aaron Lidman [Tue, 5 Nov 2013 01:38:41 +0000 (17:38 -0800)]
Simplified common details

11 years agoRejig changeset details in the style of danstowell
Aaron Lidman [Mon, 4 Nov 2013 23:24:50 +0000 (15:24 -0800)]
Rejig changeset details in the style of danstowell

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 4 Nov 2013 16:14:54 +0000 (16:14 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoMake sure we order user changeset correctly for browse#changeset
Tom Hughes [Sun, 3 Nov 2013 12:40:01 +0000 (12:40 +0000)]
Make sure we order user changeset correctly for browse#changeset

11 years agoUpdate to rails 4.0.1
Tom Hughes [Fri, 1 Nov 2013 22:34:18 +0000 (22:34 +0000)]
Update to rails 4.0.1

11 years agoSetup OAuth when rendering site#index from site#edit
Tom Hughes [Thu, 31 Oct 2013 20:52:43 +0000 (20:52 +0000)]
Setup OAuth when rendering site#index from site#edit

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 27 Oct 2013 19:34:39 +0000 (19:34 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUpdate to iD v1.3.1
John Firebaugh [Sat, 26 Oct 2013 23:56:43 +0000 (16:56 -0700)]
Update to iD v1.3.1

11 years agoUpdate to iD v1.3.0
John Firebaugh [Thu, 24 Oct 2013 16:11:57 +0000 (09:11 -0700)]
Update to iD v1.3.0

11 years agoHandle an empty type value in a nominatim result
Tom Hughes [Mon, 21 Oct 2013 15:54:56 +0000 (17:54 +0200)]
Handle an empty type value in a nominatim result

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 19 Oct 2013 19:57:31 +0000 (19:57 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoRemove robots.txt block for /user/*/diary
Tom Hughes [Thu, 17 Oct 2013 07:55:52 +0000 (08:55 +0100)]
Remove robots.txt block for /user/*/diary

11 years agoUse gpx as the extension when we ask for /trace/N/data.gpx
Tom Hughes [Tue, 15 Oct 2013 23:46:33 +0000 (00:46 +0100)]
Use gpx as the extension when we ask for /trace/N/data.gpx

11 years agoAdd tests for trace#data
Tom Hughes [Tue, 15 Oct 2013 23:46:20 +0000 (00:46 +0100)]
Add tests for trace#data

11 years agoTest user#delete
Tom Hughes [Tue, 15 Oct 2013 20:43:50 +0000 (21:43 +0100)]
Test user#delete

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