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

715 commits

Author SHA1 Message Date
John Firebaugh
44629832dd Merge branch 'master' into redesign 
Conflicts:
	vendor/assets/leaflet/leaflet.hash.js
	vendor/assets/leaflet/leaflet.js
 2013-11-19 09:42:47 -08:00
Tom Hughes
41e45bad51 Remove the _osm_username cookie and session validation logic 
This was a temporary hack to workaround issues with sessions getting
mixed up at the time of the rails 3.1 upgrade, but logs indicate that
whatever the original problem was it is no longer occurring.
 2013-11-17 21:52:39 +00:00
John Firebaugh
2b4f8e92c9 Merge branch 'master' into redesign 
Conflicts:
	app/controllers/browse_controller.rb
	app/views/layouts/_head.html.erb
	config/environments/production.rb
	config/routes.rb
 2013-11-15 16:47:49 -08:00
John Firebaugh
15ff7b9843 Remove unused 2013-11-06 13:05:51 -08:00
Tom Hughes
d85fac567b Add tests for trace#data 2013-10-16 00:46:20 +01:00
Tom Hughes
39a54f8c14 Test user#delete 2013-10-15 21:43:50 +01:00
Tom Hughes
b0fa1cf936 Test user#set_status 2013-10-15 21:39:07 +01:00
Tom Hughes
1abb7bfa56 Test user#reset_password 2013-10-15 21:27:25 +01:00
Tom Hughes
f892313c48 Test user#go_public 2013-10-15 21:14:08 +01:00
John Firebaugh
5835350879 Restore raw latlon search result 2013-10-15 21:01:14 +01:00
Tom Hughes
3e985f3ab9 Add more tests for hidden diary entries and comments 2013-10-15 19:21:39 +01:00
Tom Hughes
4f05b6a8ac Add tests for diary_entry#comments 2013-10-15 18:24:51 +01:00
Tom Hughes
53b70a5971 Add tests for diary_entry#hide and diary_entry#hidecomment 2013-10-15 18:09:39 +01:00
Tom Hughes
bcd2592ce9 Add tests for trace#delete 2013-10-15 00:12:40 +01:00
Tom Hughes
71065a5f2a Add tests for trace#edit 2013-10-15 00:12:04 +01:00
Tom Hughes
7417d14299 Add some tests for trace#view 2013-10-14 10:17:31 +01:00
John Firebaugh
aaeca5b534 Use reverse geocoders for any lat/lon queries 
This simplifies the implementation, allows code sharing with
"Where am I?", and produces friendlier results for lat/lon
searches (actual reverse geocode results rather than a raw
lat/lon display).
 2013-10-13 19:30:38 +01:00
John Firebaugh
efc6aaf215 Remove vestigial routes 
Namefinder support was removed in 1a0728ec7b.
 2013-10-13 19:23:15 +01:00
Tom Hughes
7de32f3cd5 Add a basic test for browse#note 2013-10-01 19:34:36 +01:00
Tom Hughes
25720e3ee3 Make sure the "terms seen" tests actually run 2013-09-29 15:43:16 +01:00
Tom Hughes
5fc397935c Fix routing of changeset feed 2013-09-23 13:58:59 +01:00
Tom Hughes
038c341918 Allow GET as well as POST for oauth#request_token and oauth#access_token 2013-09-23 13:47:05 +01:00
Tom Hughes
57219d516a Fix routing of RSS feeds 2013-09-23 11:05:35 +01:00
Tom Hughes
3b34f700f1 Alloe GET as well as POST for oauth#revoke and oauth#authorize 2013-09-22 18:33:26 +01:00
Tom Hughes
90875bb08a Always allow %{attribute} in model validation error messages 2013-09-21 12:03:53 +01:00
Tom Hughes
b7e795e1e1 Set hostname for signed requests correctly 2013-09-21 12:03:53 +01:00
Tom Hughes
75795125ad Remove deprecated assert_blank and assert_present from tests 2013-09-21 12:03:53 +01:00
Tom Hughes
70448559b2 Remove format specifier from RSS feed route tests 2013-09-21 12:03:53 +01:00
Tom Hughes
321f8cecdc RoutingError is now UrlGenerationError 2013-09-21 11:35:46 +01:00
Tom Hughes
6c51b3cc0a Replace deprecated finder methods 2013-09-21 11:35:46 +01:00
Tom Hughes
d8399d3e18 IntegrationTest is now in ActionDispatch not ActionController 2013-09-21 11:35:46 +01:00
Tom Hughes
bd8d207ea4 Rails now defaults to using PATCH for updates 2013-09-21 11:35:46 +01:00
Tom Hughes
f0feca800d Replace attr_accessible with strong parameters 2013-09-21 11:35:46 +01:00
Tom Hughes
984c6dc114 Update to rails 4.0.0 2013-09-21 11:35:45 +01:00
Tom Hughes
40b452ac74 Use a view to build the trace RSS feed and get rid of OSM::GeoRSS 2013-09-18 18:23:03 +01:00
Tom Hughes
9701c6210c Fix test to make sure it picks up the right token 2013-08-20 22:46:53 +01:00
Tom Hughes
56fd5c4d90 Merge remote-tracking branch 'osmlab/welcome-2' 2013-08-18 14:50:36 +01:00
Tom Hughes
031ad4f4d5 Improve tests for user details API responses 2013-08-16 21:35:54 +01:00
Tom Hughes
b9daf06684 Upgrade passwords to the latest hashing scheme on login 2013-08-14 00:24:33 +01:00
Tom Hughes
15d29c646b Strengthen password hashing algorithm 2013-08-14 00:23:03 +01:00
Tom Hughes
2b88141cb3 Update tests with new URL for mapnik exports 2013-08-13 00:34:05 +01:00
John Firebaugh
b825f4826a Fix referer params for welcome page 2013-08-12 13:34:46 -07:00
John Firebaugh
3ca642271a Redirect /edit and /export with old-style edit params 2013-08-12 13:34:46 -07:00
John Firebaugh
bda941f49d Clean up tests 2013-08-12 13:34:45 -07:00
John Firebaugh
091473602b Handle expired confirmation tokens 2013-08-12 13:34:45 -07:00
John Firebaugh
2a3bc0a387 Hook up user confirmation page 2013-08-12 13:34:44 -07:00
John Firebaugh
c5fc21e6a6 Inline validation errors on sign up page 2013-08-12 13:34:44 -07:00
John Firebaugh
58cd5bfb11 Remove unnecessary div/class/css 2013-08-12 13:34:43 -07:00
John Firebaugh
24422a3baf Move pre-sign up content to sign up page 2013-08-12 13:34:42 -07:00
John Firebaugh
2690342b08 Reduce welcome email to minimal text 
Instead, redirect newly-confirmed users to the welcome
page. If confirmation is not required, redirect immediately
and don't send an email.
 2013-08-12 13:34:40 -07:00