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

516 commits

Author SHA1 Message Date
Tom Hughes
bc31329da1 Improve testing of the trace list view 2013-01-18 00:37:44 +00:00
Tom Hughes
3cb0613db1 Fixup test failure 2013-01-16 18:39:26 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
 2013-01-15 21:11:35 +00:00
Tom Hughes
ed699548e6 Update tests for layout changes 2013-01-14 22:30:54 +00:00
Saman Bemel-Benrud
a36f3558dd Site cleanup 
I set out to do a quick and dirty typography overhaul to make things
more consistent and a bit cleaner, but I kept running into things I
didn't like, so this lead me down something of a rabbit hole of design
tweaks to the OSM site.

Goals here are to have better content hierarchy, better vertical
rhythm, more consistent UI, cleaner markup with less tables, all while
keeping the basics pretty much intact. There are a lot of things I
didn't touch even though they need to be updated (lots of tables where
stuff shouldn't be tables, mostly).

Basic overview of changes:

I added a new persistent header that helps segment pages. It's now
a lot easier to know what you're looking at. The header has a page
title, a description, plus a submenu of actions.

There is now a pattern of 20px/10px margins and padding for more
rhythm and breathing room throughout the site.

I know there are other problems here or things I've missed - would
love another set of eyes to look over this! I am still getting comfortable
working on the site - it's my first time ever digging into a ruby or rails
so I'm not familiar with the templating language yet.
 2013-01-14 21:27:08 +00:00
Tom Hughes
ba5107ebb5 Remove the author_name field from notes 2012-12-03 14:50:54 +00:00
Tom Hughes
78f608b114 Merge branch 'master' into notes 
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
 2012-12-01 18:22:30 +00:00
Tom Hughes
7d92ec7047 Merge branch 'leaflet' 2012-11-23 10:41:45 +00:00
Tom Hughes
c0b47c0c2a Serve embedded maps through the assets pipeline 2012-11-23 10:40:26 +00:00
Tom Hughes
fd6abf41bf Get the notes tests working again 2012-11-20 21:05:26 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
 2012-11-20 19:08:30 +00:00
Tom Hughes
461e39f4a5 Fix bogus test 2012-11-12 19:27:09 +00:00
Tom Hughes
b7b68aee36 Simplify handling of verified emails in OpenID signup 
Also make sure that all paths that lead to OpenID based signup
will notice a verified email properly.
 2012-10-30 21:43:38 +00:00
John Firebaugh
7751973871 Allow cross-origin requests to API 2012-10-22 19:11:52 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
 2012-10-13 15:55:34 +01:00
Tom Hughes
ab3b4b0437 Increase allowed time delta in message sending test 
Only allowing one second can fail sometimes, because if the actual
time is close to rolling over to the next second then the message
time will be rounded down but Time.now may roll over to the next
second before we get to the assertion.
 2012-09-30 14:24:28 +01:00
John Firebaugh
d62e8c43f3 Inline key partial used only on index 2012-09-30 11:59:06 +01:00
Tom Hughes
f47edb1446 Don't report the PD flag in the user API call 2012-09-24 18:44:12 +01:00
Tom Hughes
3ce4de1295 Add a /api/0.6/user/NNNN call to the API 2012-09-24 18:44:11 +01:00
John Firebaugh
20e5f756be Support the same edit params for Potlatch 1 and 2 
Trac ticket 4587
 2012-09-21 15:16:56 -07:00
Matt Amos
8523f53099 Added a test for trac ticket 4471, and fixed the issue. 2012-09-21 09:07:21 +01:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
 2012-09-20 16:01:24 +01:00
John Firebaugh
8ec415b060 Use a param to trigger export rather than a separate action 
In site/_resize.html.erb and site/_search.html.erb, a
params[:action] conditional is used to include code that
should only run on the index action -- but it should be run
on the export action too. Cleanest fix is to eliminate that
action entirely.
 2012-09-07 09:27:59 +01:00
Tom Hughes
1eab17f82e Test that replying to a message marks it as read 2012-09-03 08:47:51 +01:00
Tom Hughes
815c98c977 Select which key entries to show on the client 
Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.
 2012-08-31 10:29:32 +01:00
Tom Hughes
3d874a5d61 Use start.html.erb views instead of _sidebar.html.erb partials 2012-08-27 21:28:41 +01:00
John Firebaugh
cc4f133e64 Extract export.js static asset 2012-08-27 18:00:13 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
 2012-08-22 20:52:08 +01:00
Tom Hughes
3ec1a05988 Update tests for changes to HTML escaping in rails 3.2.8 2012-08-17 22:57:58 +01:00
Tom Hughes
05515d644a Test the links in the menu of the user view page 2012-08-15 22:36:40 +01:00
Tom Hughes
3d5a613c5e Add tests for make_friend and remove_friend 2012-08-15 22:36:39 +01:00
Tom Hughes
573991e5a9 Fixup make_friend and remove_friend properly 
Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.
 2012-08-15 20:13:14 +01:00
Tom Hughes
740ba0dd38 Require POST for make_friend and remove_friend 
Note that this breaks the make_friend link in friend notfication
emails, but it will do as a temporary measure.
 2012-08-14 22:49:52 +01:00
Tom Hughes
ec92881dd0 Fix test failure caused by moving OAuth settings link 2012-08-10 08:27:28 +01:00
Tom Hughes
e4be816ca0 Don't allow hash signs in usernames 2012-07-23 12:59:50 +01:00
Andy Allan
2c67c079ac Don't show coordinates for deleted nodes 2012-07-11 14:42:01 +01:00
Tom Hughes
04017d0e7a Fix tests to cope with stricter route enforcement in rails 2.3.6 2012-06-18 13:03:03 +01:00
Tom Hughes
91a9738ee8 Don't try and look for variables in non-existent values 2012-06-01 15:48:23 +01:00
Tom Hughes
9813d9f1e4 Get all the tests passing under ruby 1.9 2012-05-27 13:51:25 +01:00
Tom Hughes
c2148e395d Test new API permissions route 2012-05-05 15:30:23 +01:00
Enno Brehm
6a09f49e71 Implement API endpoint to query permissions. 2012-05-05 15:28:45 +01:00
Tom Hughes
bbc14fbcaa Update fixture so active_block appears live... 2012-05-01 21:27:51 +01:00
Tom Hughes
6f248b6bbb Add some basic changeset feed tests 2012-05-01 21:14:50 +01:00
Tom Hughes
d9dedf403d Test that revoking OAuth tokens works 2012-04-24 21:28:20 +01:00
Matt Amos
7da8a5a1a8 Added redactions controller test and fixed a bug in the controller 2012-04-05 13:52:01 +01:00
Matt Amos
7c42552f16 Fixed fixture after adding link from redaction to user 2012-04-05 13:51:57 +01:00
Matt Amos
9c098816e5 Added tests for browsing object histories with redacted elements 2012-04-05 13:49:59 +01:00
Matt Amos
e01a309970 Added test for changeset/download hiding redacted elements 2012-04-05 13:49:53 +01:00
Matt Amos
d9e4e5836f Added tests for old_* redaction routes 2012-04-05 13:49:51 +01:00
Matt Amos
8bfb5cae8a Added relation redaction logic, same as node and way logic, plus tests 2012-04-05 13:49:46 +01:00