]>
git.openstreetmap.org Git - rails.git/log
Tom Hughes [Sat, 13 Oct 2012 16:16:07 +0000 (17:16 +0100)]
Refactor notes code to work with recent site changes
Tom Hughes [Sat, 13 Oct 2012 14:55:34 +0000 (15:55 +0100)]
Merge branch 'master' into notes
Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/site/index.html.erb
John Firebaugh [Thu, 11 Oct 2012 18:50:54 +0000 (11:50 -0700)]
Use ejs templates in browse JS
John Firebaugh [Mon, 8 Oct 2012 05:29:58 +0000 (22:29 -0700)]
Use proj/unproj consistently
John Firebaugh [Fri, 5 Oct 2012 23:13:46 +0000 (16:13 -0700)]
Move browse-related JS to browse.js
John Firebaugh [Fri, 5 Oct 2012 23:11:54 +0000 (16:11 -0700)]
Move export-related JS to export.js
Tom Hughes [Sat, 13 Oct 2012 10:48:57 +0000 (11:48 +0100)]
Update database schema
Tom Hughes [Sat, 13 Oct 2012 10:48:13 +0000 (11:48 +0100)]
Drop renaming of sequences
Rails seems to rename sequences automatically now when the
corresponding table is renamed, so we don't need to do it.
Tom Hughes [Sat, 13 Oct 2012 10:33:16 +0000 (11:33 +0100)]
Fix require paths in migrations
Richard Fairhurst [Thu, 11 Oct 2012 10:30:57 +0000 (11:30 +0100)]
Provide example of correct attribution
Richard Fairhurst [Thu, 11 Oct 2012 10:16:24 +0000 (11:16 +0100)]
Remove Potlatch 1 from edit menu
Tom Hughes [Fri, 12 Oct 2012 19:58:08 +0000 (20:58 +0100)]
Update Potlatch 2 stylesheet and presets
Tom Hughes [Fri, 12 Oct 2012 19:57:01 +0000 (20:57 +0100)]
Potlatch 2 localisation updates
Siebrand Mazeland [Sun, 7 Oct 2012 22:08:10 +0000 (22:08 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Sun, 7 Oct 2012 15:08:13 +0000 (16:08 +0100)]
Update Potlatch 2 to
2.3-491-gc7ccf78 build
Paweł Paprota [Fri, 5 Oct 2012 17:54:58 +0000 (19:54 +0200)]
Display a diary entry count on the user page
Paweł Paprota [Fri, 5 Oct 2012 18:38:46 +0000 (20:38 +0200)]
Match wikipedia language prefixes case insensitively
Without this values like "PL:Article" are linked to the English Wikipedia.
Paweł Paprota [Fri, 5 Oct 2012 18:23:40 +0000 (20:23 +0200)]
Don't remove language prefixes from wikipedia tags
Removing the language prefix from the displayed value of a wikipedia
tag is confusing, so don't do it. Fixes trac #4135.
Tom Hughes [Fri, 5 Oct 2012 23:13:54 +0000 (00:13 +0100)]
Split long line
John Firebaugh [Fri, 5 Oct 2012 19:03:26 +0000 (12:03 -0700)]
Clean up diary_entry.js
John Firebaugh [Fri, 5 Oct 2012 18:58:45 +0000 (11:58 -0700)]
Move diary entry JS to page-specific script file
John Firebaugh [Fri, 5 Oct 2012 18:54:13 +0000 (11:54 -0700)]
Eliminate interpolation in diary entry JS
Tom Hughes [Fri, 5 Oct 2012 21:47:19 +0000 (22:47 +0100)]
Update Potlatch 2 to
2.3-486-g109b096 build
John Firebaugh [Fri, 5 Oct 2012 19:59:03 +0000 (12:59 -0700)]
Simplify further by using OSM.home
John Firebaugh [Fri, 5 Oct 2012 19:40:46 +0000 (12:40 -0700)]
Remove unused params code
John Firebaugh [Fri, 5 Oct 2012 18:38:14 +0000 (11:38 -0700)]
Remove unnecessary call to closeMapPopup()
In the 'set_location' case no popups are ever opened.
John Firebaugh [Fri, 5 Oct 2012 17:29:20 +0000 (10:29 -0700)]
Use jQuery
John Firebaugh [Fri, 5 Oct 2012 17:01:38 +0000 (10:01 -0700)]
Move user JS to page-specific script file
In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.
John Firebaugh [Fri, 5 Oct 2012 16:10:13 +0000 (09:10 -0700)]
Remove unnecessary delete statement
Tom Hughes [Fri, 5 Oct 2012 17:01:02 +0000 (18:01 +0100)]
Don't try and dereference an object that may not exist
Tom Hughes [Fri, 5 Oct 2012 15:02:26 +0000 (16:02 +0100)]
Refactor updatelinks to avoid exceptions in updateLocation
John Firebaugh [Fri, 5 Oct 2012 02:35:06 +0000 (19:35 -0700)]
Refactor mapParams to compose better with apiUrl
John Firebaugh [Fri, 5 Oct 2012 02:15:24 +0000 (19:15 -0700)]
Extract OSM.apiUrl
John Firebaugh [Fri, 5 Oct 2012 02:09:56 +0000 (19:09 -0700)]
Merge globals.js.erb and params.js
John Firebaugh [Fri, 5 Oct 2012 00:00:40 +0000 (17:00 -0700)]
Remove unused assign of @bbox which is no longer used
John Firebaugh [Thu, 4 Oct 2012 23:59:48 +0000 (16:59 -0700)]
Move remaining inline changeset JS to changeset.js
John Firebaugh [Fri, 5 Oct 2012 00:32:14 +0000 (17:32 -0700)]
Move changeset JS to page-specific script file
John Firebaugh [Thu, 4 Oct 2012 23:52:45 +0000 (16:52 -0700)]
Eliminate interpolation in changeset JS
John Firebaugh [Thu, 4 Oct 2012 21:48:36 +0000 (14:48 -0700)]
Remove unused function
Tom Hughes [Fri, 5 Oct 2012 07:55:18 +0000 (08:55 +0100)]
Add Polish translations to OpenLayers configuration.
Tom Hughes [Thu, 4 Oct 2012 17:03:02 +0000 (18:03 +0100)]
Update Potlatch 2 to
2.3-476-g1bce25a build
Tom Hughes [Thu, 4 Oct 2012 16:58:01 +0000 (17:58 +0100)]
Restrict the embedded map to the declared extent
Tom Hughes [Thu, 4 Oct 2012 16:55:53 +0000 (17:55 +0100)]
Remove redundant parameters from embedded map constructor
Tom Hughes [Tue, 2 Oct 2012 18:40:53 +0000 (19:40 +0100)]
Tidy up some CSS to match house style
Tom Hughes [Tue, 2 Oct 2012 18:17:27 +0000 (19:17 +0100)]
Fix cut and paste errors in inbox/outbox redesign
Tom MacWright [Thu, 9 Aug 2012 19:15:08 +0000 (15:15 -0400)]
Redesign inbox
Cuts down on buttons, grey, and bold clutter.
Tom Hughes [Tue, 2 Oct 2012 17:40:44 +0000 (18:40 +0100)]
Potlatch 2 localisation updates
John Firebaugh [Tue, 2 Oct 2012 02:22:39 +0000 (19:22 -0700)]
Remove unnecessary $(window).load() callbacks
All this is already inside a $(document).ready() callback.
John Firebaugh [Tue, 2 Oct 2012 02:21:37 +0000 (19:21 -0700)]
Avoid a JS error on (e.g.) ?way=nnnnn
When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.
Registering the events earlier avoids the need to call
updateLocation manually at all.
Siebrand Mazeland [Tue, 2 Oct 2012 13:13:29 +0000 (13:13 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Sun, 30 Sep 2012 13:24:28 +0000 (14:24 +0100)]
Increase allowed time delta in message sending test
Only allowing one second can fail sometimes, because if the actual
time is close to rolling over to the next second then the message
time will be rounded down but Time.now may roll over to the next
second before we get to the assertion.
Tom Hughes [Sun, 30 Sep 2012 13:07:41 +0000 (14:07 +0100)]
Remove monkey patch for I18n which is no longer needed
Tom Hughes [Sun, 30 Sep 2012 11:39:01 +0000 (12:39 +0100)]
Require version 5.0.9 of composite_primary_keys
John Firebaugh [Sat, 29 Sep 2012 18:09:01 +0000 (11:09 -0700)]
Remove @midnode assign
It does not appear to be necessary and no other edit links
make use of it. SiteController#edit will calculate a precise
center coordinate.
John Firebaugh [Sat, 29 Sep 2012 21:59:36 +0000 (14:59 -0700)]
Remove unused event argument
John Firebaugh [Sat, 29 Sep 2012 21:49:16 +0000 (14:49 -0700)]
Use $(document).ready() to initialise browse JS
John Firebaugh [Sat, 29 Sep 2012 21:45:15 +0000 (14:45 -0700)]
Move browse JS to page-specific script file
John Firebaugh [Sat, 29 Sep 2012 21:01:13 +0000 (14:01 -0700)]
Eliminate interpolation in browse map JS
John Firebaugh [Sat, 29 Sep 2012 17:01:29 +0000 (10:01 -0700)]
Clean up search JS
Move it to index.js/edit.js and eliminate the global doSearch
function. Not enough code is shared to justify it.
John Firebaugh [Sat, 29 Sep 2012 16:23:32 +0000 (09:23 -0700)]
Move edit JS to page-specific script file
John Firebaugh [Sat, 29 Sep 2012 21:25:33 +0000 (14:25 -0700)]
Inline key partial used only on index
John Firebaugh [Sat, 29 Sep 2012 21:19:48 +0000 (14:19 -0700)]
Require index-only JS in index.js
John Firebaugh [Sat, 29 Sep 2012 16:20:05 +0000 (09:20 -0700)]
Eliminate interpolation in edit JS
Tom Hughes [Sat, 29 Sep 2012 17:30:32 +0000 (18:30 +0100)]
Update Potlatch 2 to
2.3-468-ge4a2053 build
Tom Hughes [Sat, 29 Sep 2012 17:30:14 +0000 (18:30 +0100)]
Potlatch 2 localisation updates
John Firebaugh [Sat, 29 Sep 2012 16:10:09 +0000 (09:10 -0700)]
Extract home_link partial
John Firebaugh [Sat, 29 Sep 2012 15:51:00 +0000 (08:51 -0700)]
Wrap index JS in a single $(document).ready()
John Firebaugh [Sat, 29 Sep 2012 15:38:59 +0000 (08:38 -0700)]
Move index JS to page-specific script file
John Firebaugh [Sat, 29 Sep 2012 15:17:36 +0000 (08:17 -0700)]
Eliminate interpolation in index JS
Tom Hughes [Sat, 29 Sep 2012 16:34:50 +0000 (17:34 +0100)]
Update database schema
John Firebaugh [Fri, 7 Sep 2012 23:21:01 +0000 (16:21 -0700)]
Use the jQuery data() function to access HTML 5 data attributes
Siebrand Mazeland [Mon, 24 Sep 2012 18:49:53 +0000 (18:49 +0000)]
Localisation updates from http://translatewiki.net.
Tom Hughes [Mon, 24 Sep 2012 18:00:08 +0000 (19:00 +0100)]
Update Potlatch 2 to
2.3-465-g19866a9 build
Tom Hughes [Mon, 24 Sep 2012 17:43:30 +0000 (18:43 +0100)]
Don't report the PD flag in the user API call
Tom Hughes [Wed, 19 Sep 2012 18:27:13 +0000 (19:27 +0100)]
Add some extra information to user API responses
Tom Hughes [Wed, 19 Sep 2012 17:59:49 +0000 (18:59 +0100)]
Add a /api/0.6/user/NNNN call to the API
Tom Hughes [Sun, 23 Sep 2012 14:30:19 +0000 (15:30 +0100)]
Generate proper descriptions for notes
Tom Hughes [Sun, 23 Sep 2012 14:07:35 +0000 (15:07 +0100)]
Remove redundant code
Tom Hughes [Fri, 21 Sep 2012 08:05:56 +0000 (09:05 +0100)]
Add support for creating new notes
Tom Hughes [Fri, 21 Sep 2012 23:37:24 +0000 (00:37 +0100)]
Update logo on missing tile image
John Firebaugh [Fri, 21 Sep 2012 22:20:15 +0000 (15:20 -0700)]
Don't expose lat/lon of private traces
John Firebaugh [Fri, 21 Sep 2012 22:16:56 +0000 (15:16 -0700)]
Support the same edit params for Potlatch 1 and 2
Trac ticket 4587
Matt Amos [Thu, 20 Sep 2012 23:45:53 +0000 (00:45 +0100)]
Added a test for trac ticket 4471, and fixed the issue.
Tom Hughes [Thu, 20 Sep 2012 15:04:25 +0000 (16:04 +0100)]
Use standard indentation
Tom Hughes [Thu, 20 Sep 2012 15:01:24 +0000 (16:01 +0100)]
Merge branch 'master' into openstreetbugs
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/site/index.html.erb
Tom Hughes [Thu, 20 Sep 2012 08:25:53 +0000 (09:25 +0100)]
Move the administrator details further down the user page
Tom MacWright [Fri, 31 Aug 2012 15:46:26 +0000 (11:46 -0400)]
moderate refactoring of the user page
Tom Hughes [Wed, 19 Sep 2012 11:12:45 +0000 (12:12 +0100)]
Suppress any border on the logo
Tom Hughes [Tue, 18 Sep 2012 10:54:11 +0000 (11:54 +0100)]
Remove unused namefinder support from the geocoder backend
John Firebaugh [Mon, 27 Aug 2012 00:01:39 +0000 (17:01 -0700)]
Move param-based map configuration to client
This prepares us for hash-based permalinks (#81) and removes
the duplication between index.html.erb and SiteController#edit.
John Firebaugh [Tue, 18 Sep 2012 00:00:03 +0000 (17:00 -0700)]
Use jquery.cookie
John Firebaugh [Thu, 30 Aug 2012 16:00:55 +0000 (09:00 -0700)]
Extract layer configuration to map.js
Martijn van Exel [Sat, 15 Sep 2012 02:29:48 +0000 (20:29 -0600)]
Add a banner for SOTM US
Tom Hughes [Sun, 16 Sep 2012 14:17:17 +0000 (15:17 +0100)]
Fix interpolation errors
Tom Hughes [Fri, 14 Sep 2012 14:54:37 +0000 (15:54 +0100)]
Update database schema
Siebrand Mazeland [Sun, 16 Sep 2012 02:35:34 +0000 (02:35 +0000)]
Localisation updates from http://translatewiki.net.
Gnonthgol [Fri, 14 Sep 2012 11:49:55 +0000 (13:49 +0200)]
Remove the "We are changing the license" flash on the login page
Tom Hughes [Thu, 13 Sep 2012 09:51:51 +0000 (10:51 +0100)]
Potlatch 2 imagery update
Tom Hughes [Thu, 13 Sep 2012 08:56:26 +0000 (09:56 +0100)]
Fix interpolation issues in attribution text
Tom Hughes [Wed, 12 Sep 2012 15:25:14 +0000 (16:25 +0100)]
Update Potlatch 2 to
2.3-455-g0b5f2c0 build