cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2511 commits 4 branches 1 tag 499 MiB
Commit graph

145 commits

Author SHA1 Message Date
Tom Hughes
f3bf0c8b14 Add the ability for a recipient to (logically) delete a message from 
their INBOX so they no longer see it.
 2009-07-23 15:22:44 +00:00
Tom Hughes
942ca1ff23 Merge 16355:16480 from trunk. 2009-07-13 23:28:02 +00:00
Štefan Baebler
0ace75e663 fixed a mixup (not really broken, but producing decieving http traffic and logs) 2009-07-07 23:28:56 +00:00
Tom Hughes
9a32033209 Merge 16216:16355 from trunk. 2009-07-05 23:47:40 +00:00
Tom Hughes
336d40f2c5 Switch to using ATOM for changeset feeds. 2009-07-04 11:34:23 +00:00
Ævar Arnfjörð Bjarmason
e7f5f42856 Changeset [16271] changed "=" in the shortlink to "-" but didn't 
update the routes to match.

Change the regex to accept [=-]* ("=" since we want to be backwards
compatable)
 2009-07-02 21:44:26 +00:00
Tom Hughes
06b2d278ea Make the search box load each set of results separately so that one 
service being slow doesn't delay the response from others.
 2009-07-02 16:12:38 +00:00
Tom Hughes
6baccfaddd Merge 16110:16216 from trunk. 2009-06-29 16:50:34 +00:00
Ævar Arnfjörð Bjarmason
34b147266c Change the feature commited in [16174] to use the main map view 
instead of being located at /map.
 2009-06-27 15:34:26 +00:00
Ævar Arnfjörð Bjarmason
8bc8e537b2 Introducing a new /browse/{node,way,relation,changeset}/{id}/map page 
which is slippy map covering the screen showing the map data that is
in the small map at /browse/{node,way,relation,changeset}/{id}.

/browse/{node,way,relation,changeset}/{id} now contains a link to both
"View Larger Map" which has been changed to link to this new map
feature, and "View on main map" which as before links to the area
showing the feature on the main slippy map.

/browse/{node,way,relation,changeset}/{id}/map supports permalinks
using its own hacked version of updateLocation() (which doesn't set a
cookie), but shortlinks are not supported. The Edit/History/Export
links link back to the main map.
 2009-06-27 09:30:10 +00:00
Matt Amos
1d8e66016c Adding 'shortlink' functions which will allow URLs like http://osm.org/go/XXXX suitable for use in twitter, etc... 2009-06-25 23:31:53 +00:00
Tom Hughes
02628bed1e Merge 16012:16110 from trunk. 2009-06-25 16:32:05 +00:00
Tom Hughes
e3f37d9872 Add new route for AJAX call to get map key. 2009-06-24 23:39:25 +00:00
Tom Hughes
f4571eeb7c Revert r16046. 
DO NOT COMMIT MAJOR ENHANCEMENTS TO TRUNK WITHOUT TALKING TO ME FIRST.
 2009-06-23 02:48:38 +00:00
Matt Amos
b8f6dbd403 Adding initial version of the OAuth token authentication method. This adds basic OAuth support for registering apps, getting and revoking keys, etc... The tokens come with 6 separate permissions bits; read/write user preferences, write diaries, write API and read/write GPS traces. Needs more tests. 2009-06-22 16:54:37 +00:00
Thomas Wood
ff03138a97 merge 15807:16012 from rails_port 2009-06-19 22:53:16 +00:00
Thomas Wood
98a86836d2 Commit avar's patch (+ fix for user not found) to change message sending URL to be by user name rather than id. 
(Closes #1920)
 2009-06-19 22:33:16 +00:00
Tom Hughes
edaddbedae Merge 15722:15806 from head and adjust new views to rails 2 style names. 2009-06-09 21:50:37 +00:00
Ævar Arnfjörð Bjarmason
ea93ad2f07 Since both site.rhtml and site.rxml exists we have to add :format => 
'rhtml' to the root controller so that the index isn't broken.

RSS feeds also work without XHTML being added to them now.
 2009-06-09 13:23:08 +00:00
Tom Hughes
9df991e343 Marge all the changeset list methods together into one. 2009-06-07 16:59:58 +00:00
Tom Hughes
396d8ce313 Use some rails magic to avoid having to duplicate all the changeset 
list controller methods for the RSS feeds.
 2009-06-07 11:24:11 +00:00
Tom Hughes
e1cb17faa6 Back out the changeset RSS stuff from the head for now. 2009-06-07 08:03:07 +00:00
Ævar Arnfjörð Bjarmason
0d16fd57d4 Add RSS feed for global recent changes & changes within a bbox. Solves #1737 
This has so much copy/paste code it hurts, the new list*_rss methods
are just copies of the old list* methods, but see #1927 for that.
 2009-06-07 02:39:45 +00:00
Ævar Arnfjörð Bjarmason
011237c2c5 Implement /user/$user/edits/rss, partially solves #1737 2009-06-07 01:32:19 +00:00
Shaun McDonald
afce15dd86 Use a more rails like way for the new coordinates link, which also localizes the display of the lat lon numbers. Couple more translations. 2009-05-31 14:05:12 +00:00
Tom Hughes
e66af2f0c3 Connect up the versioned capabilities call again. 2009-04-21 09:32:19 +00:00
Thomas Wood
df8cd4a7b2 Expose relation version to api and fix remaining server status typo in old_relation controller. 2009-04-20 19:44:58 +00:00
Harry Wood
d3c6087409 js changes for 'history' tab 2009-03-23 16:41:18 +00:00
Richard Fairhurst
cc90867183 view changesets by user 2008-12-23 13:06:07 +00:00
Shaun McDonald
a4e5e8437f Renaming the include action to expand_bbox in the changeset controller. 2008-11-26 11:36:10 +00:00
Matt Amos
98b15bef45 Implemented changeset tags updating via the update method. 2008-11-17 11:45:50 +00:00
Matt Amos
0be6dd860f Ooops, forgot to commit the routes for the changeset query and include calls. 2008-11-10 15:37:34 +00:00
Richard Fairhurst
3065af398d 0.6-friendly Potlatch (work in progress). DO NOT SET POTLATCH_USE_SQL=false as it won't work 2008-11-09 23:50:03 +00:00
Shaun McDonald
bf29550db8 Resyncing from head 10895:11795 2008-11-08 11:52:58 +00:00
Matt Amos
8a57904398 Implemented osmChange diff downloads for changesets and a couple of tests. 2008-10-27 17:50:28 +00:00
Matt Amos
dc2a959037 Added tests for changeset upload code. Refactored diff reading code and put it into /lib. Changed the route of a changeset upload to explicitly refer to the changeset it applies to (i.e: resource). 2008-10-23 15:14:17 +00:00
Shaun McDonald
6889ee7564 Making the capabilities api version indipendent 2008-10-20 20:40:06 +00:00
Shaun McDonald
3e9ceb0c38 more testing of the api. Changing the generator so that it is a constant to come in line with the server url and the api version. Adding tracepoints per page to the capabilities api call. Better error message for api call. 2008-10-19 07:09:04 +00:00
Shaun McDonald
2c16177174 adding changeset stuff for the data browser 2008-10-13 20:48:58 +00:00
Richard Fairhurst
caa20ccc40 Potlatch 0.10e 2008-10-12 23:11:37 +00:00
Shaun McDonald
0ec26f14a0 adding some version reading for the nodes 2008-09-29 16:28:51 +00:00
Shaun McDonald
d9e070e069 Doing a resync from mainline 8633:10895. There was one simple to resolve conflict on app/models/node.rb. Also moving the migrations for API0.6 to new sequence numbers since there was some new migrations added to mainline, where the migration numbers would conflict if not moved. 2008-09-25 15:06:05 +00:00
Tom Hughes
791062569d Tidy up diary code a bit. 2008-08-24 15:12:20 +00:00
Richard Fairhurst
3b6d2c5336 edit diary entries 2008-08-21 21:40:23 +00:00
Tom Hughes
1fb4e929bd Commit new route for email confirmation changes. 2008-08-18 07:28:26 +00:00
Tom Hughes
1e98eb9950 Allow users to remove their image. Closes #1010. 2008-07-07 23:26:41 +00:00
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +00:00
Tom Hughes
398d5fa329 Improve the layout of the object browser views. 2008-06-24 16:44:45 +00:00
Tom Hughes
960d13488a Merge 7922:8377 from trunk. 2008-06-22 12:23:43 +00:00
Tom Hughes
2cf15b549e Add support for putting the site in an offline mode where it operates 
without a database but with most features disabled.
 2008-06-22 12:10:32 +00:00