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

1099 commits

Author SHA1 Message Date
Tom Hughes
3227f40193 Make more use of named scopes 2011-11-14 09:42:51 +00:00
Tom Hughes
8ae5d94b2f Update some more queries to use AREL in place of deprecated methods 2011-11-14 09:42:51 +00:00
Tom Hughes
f0d7c4a8d6 Rework expansion of HTTP status code to work with rails 3 2011-11-14 09:42:48 +00:00
Tom Hughes
7f556f94f1 Temporary fix for postgres enums pending rails 3.0.4 2011-11-14 09:42:46 +00:00
Tom Hughes
b89486eab0 Rework AMF controller's streaming output for rails 3 2011-11-14 09:42:46 +00:00
Tom Hughes
1e13e6ae2d Update oauth support for rails 3 version of oauth plugin 2011-11-14 09:42:45 +00:00
Tom Hughes
986f1c61fa Use last_modified method instead of setting the header manually 2011-11-14 09:42:44 +00:00
Tom Hughes
226c41be69 Update ActiveRecord queries to use arel 2011-11-14 09:42:44 +00:00
Tom Hughes
423f5ffbc2 Use config.filter_parameters instead of filter_parameter_logging 2011-11-14 09:42:43 +00:00
Tom Hughes
7d45c2fd3c Replace request.request_uri with request.fullpath 2011-11-14 09:42:42 +00:00
Tom Hughes
2e2c95133b Use new ActionMail API to send emails 2011-11-14 09:42:41 +00:00
Tom Hughes
e1213a4651 Use Rails.xxx instead of RAILS_XXX 2011-11-14 09:42:40 +00:00
Tom Hughes
c9fa49c994 Update to rails 3 2011-11-14 09:42:40 +00:00
Tom Hughes
dc4cc8d219 Add support for manual tracking of a Piwik goal on signup 2011-09-20 21:40:53 +01:00
Tom Hughes
9793e4fb7f Use parent.tile.openstreetmap.org for the export URL 2011-09-08 11:47:00 +01:00
Tom Hughes
f242c9de94 Add edit links to data browser pages 2011-07-19 22:48:29 +01:00
Tom Hughes
e5c80c80ad Use num_changes to detect empty changesets instead of the bbox 2011-07-12 15:55:17 +01:00
Tom Hughes
59a49a6ef5 Fix problems with database offline mode 2011-06-23 08:30:44 +01:00
Tom Hughes
0a81411e68 Make the AMF API check that the CTs have been agreed 2011-06-20 09:20:30 +01:00
Tom Hughes
da572b90c7 Don't error if we fail to get SReg and/or AX data from OpenID 2011-06-15 00:07:32 +01:00
Tom Hughes
c940313823 Fix some broken tests 2011-06-14 22:57:10 +01:00
Tom Hughes
540e56a9cc Add an option to require the CTs to be agreed to edit 2011-06-14 22:57:05 +01:00
Tom Hughes
83ecb516a4 Make password signups work 2011-06-10 21:48:17 +01:00
Tom Hughes
ce7b651eb2 Merge branch 'master' into openid 2011-06-10 19:11:08 +01:00
Tom Hughes
c4f7a8346a Use session.delete to remove entries instead of assigning nil 2011-06-01 10:17:54 +01:00
Tom Hughes
d681d7e07f Force a session to be created when doing a cookie test 2011-06-01 10:16:11 +01:00
Tom Hughes
2a635ab28f Start ROTS for user login tests as well as creation tests 2011-05-21 13:35:15 +01:00
Tom Hughes
832b96b75a Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/terms.html.erb
	test/fixtures/users.yml
 2011-05-21 12:14:56 +01:00
Tom Hughes
42e72d5591 Make the edit action default to z17 
If an attempt is made to invoke an editor without specifying a zoom
level (as with the GPX edit links) then default to z17 instead of z14
to avoid trying to load too much data. Fixes #3728.
 2011-05-07 00:05:49 +01:00
Mikel Maron
48929e8781 Add a map to the changeset list page 
Add a map to the changeset list page, with a bounding box for each
changeset and highighting when the mouse is placed over either a box
on the map or a row of the table.
 2011-05-01 22:55:28 +01:00
Tom Hughes
02e186ee5b Allow user details to be fetched without agreeing terms 2011-04-20 21:17:59 +01:00
Tom Hughes
37b6418f72 Revert "Allow user details to be fetched without agreeing terms" 
This reverts commit ddd12b03e1.
 2011-04-18 23:04:42 +01:00
Tom Hughes
ddd12b03e1 Allow user details to be fetched without agreeing terms 2011-04-18 22:23:48 +01:00
Tom Hughes
6f7eb8f0e8 Don't require terms to be agreed when logging out 2011-04-18 09:04:57 +01:00
Matt Amos
c21aa5933a Added flash notice for CTs decline 
Also ensured that CTs are either accepted or declined and cannot
be inadvertently bypassed.
 2011-04-18 00:29:15 +01:00
Tom Hughes
2ba5067fcf Use report_error so Potlatch can see the errors 2011-04-17 21:45:04 +01:00
Tom Hughes
8024a38be4 Make sure "please read the terms" error is issued in the right language 2011-04-17 20:33:49 +01:00
Tom Hughes
b77c6fe8ae Improve recognition of OAuth referers for triggering of slim mode 2011-04-06 13:24:08 +01:00
Tom Hughes
685a35524a Try and patch up poor browser language selections 
The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.

Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.

Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.
 2011-04-04 22:44:43 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8 Only show login/signup in slim mode when used from oauth 2011-04-03 13:46:18 +01:00
Andy Allan
6edbcc12df Use slim layout for OAuth pages too 2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146 Another approach, but this time without scattering stuff all over the methods 2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1 Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect 2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34 Use the slim layout on the login page 2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855 Make sure the user is redirect correctly after seeing the terms 2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015 Tidy up a few things 2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
f3ff36418b Fixed bug in changeset queries 
The 'or' condition needed to be bracketed within larger 'and' expression.
 2011-03-15 13:56:55 +00:00
Tom Hughes
11aff90f63 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	public/stylesheets/common.css
 2011-02-10 14:10:19 +00:00