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

78 commits

Author SHA1 Message Date
Kai Krueger
84db1d66b7 merge 19364:19600 of rails_port into the openID branch 
renamed migration 049_add_open_id_authentication_tables.rb to
050_add_open_id_authentication_tables.rb
 2010-01-23 15:31:01 +00:00
Tom Hughes
563769b126 There's no need to use an alternative repository for SystemTimer as it 
is in the main one - just specify the right version instead.
 2010-01-18 09:19:20 +00:00
Shaun McDonald
868210ece7 Use the latest version of SystemTimer. Also gets rid of the warning: 'cleanup_timer: Previous SIG_ALRM handler not initialized\!\:' when running the tests due to using the older version of this gem. 2010-01-18 00:20:45 +00:00
Tom Hughes
841ebe80d7 Use system_timer for timeouts to make them more reliable. 2010-01-11 09:28:31 +00:00
Kai Krueger
ca558c692e This is the initial implementation of login via OpenID 
This is the patch presented in trac ticket #2500

With this commit, it is possible to assosciate an openID
to an existing OSM account. Once associated, it is possible
to either login via OpenID, or as always via username and password.

Other aspects, such as account creation and the need for a valid email
are unchanged.
 2010-01-10 17:41:32 +00:00
Tom Hughes
314b734aa5 Introduce some caching for diary views. 2010-01-09 16:43:38 +00:00
Tom Hughes
0f5646d7f0 Add ability to take GPX storage offline. 2009-12-12 13:06:56 +00:00
Tom Hughes
74e0acf0f5 Require oauth 0.3.6 and remove Matt's comment saying we need to 
require it when it's available.
 2009-12-02 09:10:38 +00:00
Tom Hughes
7b7c11f228 Update site to use rails 2.3.5. 2009-12-02 09:00:23 +00:00
Tom Hughes
1844a19f48 Add support for GeoIP lookups using Quova. 2009-11-25 00:52:44 +00:00
Tom Hughes
63b399c9b2 Update to rails 2.3.4 for security fixes. 2009-09-04 08:45:38 +00:00
Matt Amos
45a3acb4e2 Changed required version of OAuth gem, as that exact version wasn't necessary. 2009-08-03 13:59:47 +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
Tom Hughes
2f3e23f6eb Move to version 2.3.2 of rails. 2009-06-04 08:08:24 +00:00
Shaun McDonald
62f999cd83 Updating for rails 2.2.2 2009-05-08 18:04:08 +00:00
Tom Hughes
94a807d0d0 Remove explicit load of mysql and rails automatically loads the 
right database driver already.
 2009-04-21 07:52:47 +00:00
Tom Hughes
5449cf4adc Merge 14394:14533 from trunk. 2009-04-16 21:11:12 +00:00
Tom Hughes
09fdee5493 Add a "database readonly" state that allows all writes to the database 
to be suppressed.
 2009-04-14 14:27:30 +00:00
Tom Hughes
bed9cd00ed Merged 14009:14059 from trunk. 2009-03-12 00:13:27 +00:00
Tom Hughes
c8ee135104 Merge 12304:14009 from trunk. 2009-03-08 13:02:37 +00:00
Shaun McDonald
0ff1214f86 Make the role in relations optional, with a test to make sure it is. Also start moving the errors reading the xml to exceptions, thus making it possible to give meaningful error messages, when bad xml is sent (More work is required on this including doing the same for nodes and ways). With the latest gems update it seems that the lib xml handling was broken, using the newer method. Adding the content type for the exceptions. 2008-11-24 18:55:24 +00:00
Shaun McDonald
1818679416 Make the dates and times that the server deals with UTC. This is probably required for changeset, as they could auto close instantly when the clocks go forward by one hour. 2008-11-17 19:11:54 +00:00
Shaun McDonald
771a4e5be3 bumping the version of composite primary keys for the amf controler as there are bugs in it 2008-11-09 11:13:10 +00:00
Frederik Ramm
7a3f7bc2dd fix accidental commit of local config changes 2008-11-08 19:55:13 +00:00
Frederik Ramm
79420631ce fix version number return for "modify" sections of diff uploads 2008-11-08 19:43:31 +00:00
Shaun McDonald
b4c46ba4b8 add a comment about why the error handler is required, as per mail from TomH. Also adding the option so that we are using the old style of migrations, rather than the 2.1+ migrations. 2008-10-29 15:45:48 +00:00
Shaun McDonald
252c2f7022 Updating to use Rails 2.1.2. Moving the gem dependancies to the config/environment.rb file. Moving the vendor/plugins externals into our svn. 2008-10-28 20:42:48 +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
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
49637fed70 Move Potlatch configuration to a separate initialiser file. 2008-07-15 18:05:22 +00:00
Richard Fairhurst
62a1ec4748 Potlatch 0.10 2008-07-09 22:19:48 +00:00
Shaun McDonald
5f8ab9e924 Merge changes from trunk 7673:8632. 2008-07-03 13:06:24 +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
Tom Hughes
e7346e5903 Go back to rails 2.0.2 for now as 2.1.0 doesn't quite work... 2008-06-06 23:32:21 +00:00
Tom Hughes
4fc6b982dd Switch to rails 2.1.0 release. 2008-06-06 23:17:56 +00:00
Tom Hughes
e2539b7126 Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now. 2008-06-05 23:06:29 +00:00
Tom Hughes
0ef056ffbc Stick with rails 2.0.1... 2008-05-04 11:32:49 +00:00
Frederik Ramm
8c5638d696 initial changeset support 2008-05-04 10:41:42 +00:00
Steve Coast
63e0486ca1 Lots of documentation updates, plus split out potlatch libraries in to lib 2008-01-24 16:03:56 +00:00
Steve Coast
3bd92c1670 move potlatch presets to only be generated once, and allow pulling in way_tags in a way via a false primary key 2008-01-24 10:52:10 +00:00
Tom Hughes
4d06426c2a Revert to rails 2.0.1 again 2008-01-22 18:00:30 +00:00
Xin Zheng
613325a0d0 added rspec folder/files 2008-01-22 16:55:14 +00:00
Xin Zheng
5cc239f329 changing back to rails 2.0.1 2008-01-22 16:51:07 +00:00
Xin Zheng
726836f31e extracted require statement from environment.rb to intializers/requires.rb 2008-01-22 16:50:14 +00:00
Steve Coast
ddd5b4cf19 make amf_controller use rails objects, and stuff, in the getway method. You need to install the multipart keys plugin now, see the README. 2008-01-22 15:00:54 +00:00
Nick Whitelegg
6a7ae38d80 began callback code for feature lookup 2008-01-07 20:45:56 +00:00
Nick Whitelegg
2e03861300 Began code for feature lookup: implemented code to respond to mouse click and latlon to non spherical Mercator (for the postgis database) 2008-01-07 20:25:12 +00:00
Tom Hughes
7fc2dbecd5 Migrate web site to use rails 2.0.1. 2008-01-06 12:17:58 +00:00
Tom Hughes
15c492ebfe Try and make asset tagging actually work. 2007-12-06 18:42:45 +00:00
Gabriel Ebner
e03ea17a22 rails_port_0.5: Merge rails_port r4643 2007-09-22 19:55:33 +00:00