Tom Hughes
7c98b41cc8
Merge branch 'master' into openstreetbugs
2011-06-22 22:36:43 +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
419b2cb696
Improve look of OpenID login on small screen devices
2011-06-19 17:54:47 +01:00
Tom Hughes
84733f2fb0
Use smaller logos for OpenID logins
2011-06-19 17:49:36 +01:00
Tom Hughes
59b740690e
Update Potlatch 2 to 2.2-6-gaa899ca build
2011-06-19 12:13:12 +01:00
Tom Hughes
6450e7c03c
Update Potlatch 2 to 2.2-1-gdec4a94 build
2011-06-18 09:08:33 +01:00
Tom Hughes
ee7878b288
Update Potlatch 2 to 2.2 build
2011-06-17 23:21:59 +01:00
Tom Hughes
347c12b5ea
Make sure the ID of OpenID URL fields is openid_url
2011-06-15 14:26:58 +01:00
Tom Hughes
ecbad776fb
Expire user pages when their image changes
2011-06-15 09:51:56 +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
01998838fd
Fix field names so password logins work
2011-06-10 21:32:57 +01:00
Tom Hughes
ce7b651eb2
Merge branch 'master' into openid
2011-06-10 19:11:08 +01:00
Tom Hughes
85e99d3127
Expire diary pages which contain comments by a user when necessary
2011-06-09 15:22:15 +01:00
Tom Hughes
31b2d45108
Only check some user validations when the field has changed
2011-06-07 00:22:23 +01:00
Tom Hughes
86bb9e5a50
Allow a parameter to set the default value for the username
2011-06-03 15:04:05 +01:00
Tom Hughes
26b217c0ad
Work round session expiry bug in rails 2.3.11
...
Rails uses :expire_after in the session options to specify when a
sesssion should expire, but when Rack sets the cookie it expects to
see :expires in the cookie options but Rails 2.3.11 fails to do the
conversion so doesn't set the cookie expiry.
To work around this, we set both options in the session options...
2011-06-02 10:23:22 +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
4d64b178b8
Add credit for Vienna data to copyright page
2011-05-31 21:04:55 +01:00
Tom Hughes
c20b31b54e
Merge branch 'master' into openstreetbugs
2011-05-31 19:20:42 +01:00
Tom Hughes
652dbf5044
Merge branch 'master' into openid
...
Conflicts:
config/locales/en.yml
2011-05-31 19:10:31 +01:00
Tom Hughes
bf8bbdc220
Update rails translations
2011-05-31 18:11:31 +01:00
Tom Hughes
beeb77721f
Update to Rails 2.3.11
...
Update the site to use Rails 2.3.11 which also required switching to
the new syntax for interpolated variables in translation strings.
2011-05-31 18:11:31 +01:00
Siebrand Mazeland
f106c93357
Localisation updates from http://translatewiki.net .
2011-05-31 19:04:05 +02:00
Tom Hughes
8d38da6b77
Improve the look of the OpenID enabled login form on mobile devices
2011-05-29 10:17:30 +01:00
Tom Hughes
26b42dbe97
Replace MySpace with AOL in the OpenID login buttons
2011-05-28 00:17:52 +01:00
Tom Hughes
f539c79a56
Make titles on OpenID icons a bit more friendly
2011-05-27 20:41:37 +01:00
Tom Hughes
5cc9e4ed8e
Update Potlatch 2 to 2.1-21-g5f128f5 build
2011-05-27 18:56:14 +01:00
Tom Hughes
a37e1b8f70
Merge branch 'master' into openid
...
Conflicts:
app/views/user/login.html.erb
2011-05-22 18:01:15 +01:00
Tom Hughes
5ff9f2d21c
Merge branch 'master' into openstreetbugs
2011-05-22 17:59:35 +01:00
Grant Slater
8faad225f0
Update OSM logos to perspective tweaked version
2011-05-22 17:50:29 +01:00
Tom Hughes
c41d0c277e
Update Potlatch 2 to 2.1-12-g870b72b build
2011-05-22 17:49:33 +01:00
Tom Hughes
023050840a
Improve presentation of supporting links on the terms page
2011-05-22 17:48:16 +01:00
Tom Hughes
8382181635
Tidy up the note controller
...
Go through most of the note controller, tidying things up, fixing
a few bugs, and making sure we have tests for everything.
2011-05-22 17:02:48 +01:00
Grant Slater
c7ffb35e8b
Correct some minor html validation errors
2011-05-22 16:16:44 +01:00
Grant Slater
20cab5b9bf
Add summary + informal translations links to terms page
2011-05-22 15:10:30 +01:00
Tom Hughes
08d6a0c910
Update tests for change in name from "map_bug" to "note" etc
2011-05-22 12:40:56 +01:00
Tom Hughes
ab2acea49b
Tidy up the note_comment model a bit
2011-05-22 11:49:48 +01:00
Tom Hughes
33c0f15990
Tidy up the note model a bit
2011-05-22 11:33:49 +01:00
Tom Hughes
7014cdb32c
Only add bbox data to the search form while we submit it
...
Having the bbox attributes on the search form all the time means
that Firefox will incude them in the arguments if you bookmark the
search using "Add a keyword for this search" on the context menu.
2011-05-22 11:10:28 +01:00
Matt Amos
9105a7e66d
Updated to libxml-ruby 2.0.5 and fixed code accordingly.
...
I've tested this through the unit tests and by hitting it with
bulk_upload.py and neither fail or cause the server to crash or
go into an infinite loop. Both of these things happened randomly
with 1.1.3/4 due to an apparent early deregistration of the
expanded nodes.
2011-05-21 17:36:58 +01:00
Tom Hughes
ddc9446ed8
Update Potlatch 2 to 2.1 build
2011-05-21 17:25:36 +01:00
Tom Hughes
e3b8b89330
Mass rename of "bugs" as "notes" for increased user friendliness
2011-05-21 17:22:31 +01:00
Tom Hughes
d768ef31c9
Improve layout of OpenID buttons
2011-05-21 14:54:15 +01:00
Tom Hughes
cf82ca0b40
Give OpenID logo images a transparent background
2011-05-21 14:47:54 +01:00
Tom Hughes
4e38994d1b
Cleanup merge breakage
2011-05-21 14:05:55 +01:00
Tom Hughes
2a635ab28f
Start ROTS for user login tests as well as creation tests
2011-05-21 13:35:15 +01:00
