Commit graph

2165 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
Siebrand Mazeland
0b7deb6375 Localisation updates from http://translatewiki.net. 2013-11-19 06:57:29 +00:00
John Firebaugh
6929566543 Shorten intro text 2013-11-18 18:04:05 -08: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
Aaron Lidman
e62bac06ed Improved noteLayer and dataLayer availability, closes #65 2013-11-15 15:06:44 -08:00
John Firebaugh
dc82421f56 Adjustments to about page and welcome copy 2013-11-15 15:04:46 -08:00
Tom Hughes
f3d793c7e8 Make the link from site#help to site#welcome use a relative URL 2013-11-15 19:01:33 +00:00
John Firebaugh
b92cb5b772 Use html5shiv for IE8 compatibility 2013-11-15 10:46:56 -08:00
John Firebaugh
a62141ce7f Drop pngfix.js
Don't need to support IE 6 anymore (<0.2% of users).
2013-11-14 19:32:24 +00:00
Aaron Lidman
fd8f35309d Fix disabled overlay layers translations 2013-11-14 09:12:39 -08:00
John Firebaugh
3e305fb162 Fix lego translations 2013-11-12 14:46:47 -08:00
John Firebaugh
9dd230d0bc Refactor browse templates 2013-11-12 13:22:55 -08:00
John Firebaugh
e670da54cb Rationalize browse translation keys 2013-11-12 12:51:33 -08:00
John Firebaugh
1757a5a789 Remove unused translations 2013-11-12 12:30:24 -08:00
John Firebaugh
7733056858 Fix translations 2013-11-12 12:17:40 -08:00
Aaron Lidman
1a0ef82ab8 Style browse 404 page and simplify wording, closes #53 2013-11-12 11:36:09 -08:00
Aaron Lidman
7a435df917 Moved note description to the sidebar header 2013-11-12 10:09:46 -08:00
John Firebaugh
c4090bb150 Improve browse design 2013-11-12 09:03:23 -08:00
Siebrand Mazeland
d9a48e936e Localisation updates from http://translatewiki.net. 2013-11-12 13:59:27 +00:00
Aaron Lidman
1b19974b12 Add note creation to the sidebar 2013-11-11 19:06:07 -08:00
Aaron Lidman
2ebe5de1a1 Fix note formatting issues 2013-11-11 09:35:58 -08:00
Aaron Lidman
b56fb25068 Restructured notes page 2013-11-11 09:35:58 -08:00
Aaron Lidman
1ae7872ed8 Update title on pushState, closes #33 2013-11-08 16:10:08 -08:00
John Firebaugh
b903d8b746 Fix browse overlay status messages 2013-11-08 10:46:24 -08:00
John Firebaugh
b90d27cdff Tweak attribution 2013-11-07 12:14:10 -08:00
Eden Halperin
8f3e6ca6d7 Left-align intro buttons and update donate icon 2013-11-07 15:09:16 -05:00
John Firebaugh
6d5ce8d492 Move sidebar footer elements elsewhere
Donate is in attribution control.
Hosting credits are on about page.
2013-11-07 11:21:35 -08:00
John Firebaugh
d8cf49f0d7 Improve pagination in changeset details 2013-11-06 17:28:39 -08:00
Aaron Lidman
864901d167 Remove #view_tab 2013-11-06 17:19:37 -08:00
Aaron Lidman
694fa065c0 Split come changset display logic into a helper 2013-11-06 13:59:42 -08:00
Eden Halperin
726db77827 Fix donate link in attribution 2013-11-06 16:20:26 -05:00
Eden Halperin
0a040c7a79 Add donation attribution to mapnik layer 2013-11-06 16:14:27 -05:00
John Firebaugh
15ff7b9843 Remove unused 2013-11-06 13:05:51 -08:00
John Firebaugh
07c6d714c5 Remove unused about page code 2013-11-06 11:15:08 -08:00
Aaron Lidman
4baa17511f Hook up 'Learn More' and 'Sign Up' buttons 2013-11-06 10:24:34 -08:00
Aaron Lidman
d1cc387080 Improve changeset template 2013-11-05 18:28:11 -08:00
Aaron Lidman
684e7db45a Improve notes template 2013-11-05 13:31:41 -08:00
Aaron Lidman
fc5998d493 Simplified common details 2013-11-04 17:38:41 -08:00
Siebrand Mazeland
697790562b Localisation updates from http://translatewiki.net. 2013-11-04 16:14:54 +00:00
Siebrand Mazeland
781082cd20 Localisation updates from http://translatewiki.net. 2013-10-27 19:34:39 +00:00
Siebrand Mazeland
b180b5490b Localisation updates from http://translatewiki.net. 2013-10-19 19:57:31 +00:00
John Firebaugh
5835350879 Restore raw latlon search result 2013-10-15 21:01:14 +01:00
Tom Hughes
b0936b87f4 Monkey patch composite_primary_keys to fix deletes via has_many
https://github.com/composite-primary-keys/composite_primary_keys/pull/170
2013-10-15 00:17:39 +01:00
Tom Hughes
71065a5f2a Add tests for trace#edit 2013-10-15 00:12:04 +01:00
Siebrand Mazeland
b0331119ca Localisation updates from http://translatewiki.net. 2013-10-14 09:14:40 +00:00
John Firebaugh
8530e3eedb AJAXy changeset history 2013-10-13 14:46:09 -07:00
John Firebaugh
a4e38ea695 Precompile about.js 2013-10-13 14:46:08 -07:00
John Firebaugh
35458c0096 Convert search to pushState 2013-10-13 14:46:08 -07:00
John Firebaugh
a56d1036d5 pushState based navigation between map-based layouts 2013-10-13 14:46:08 -07:00
John Firebaugh
85e6bbde9b Eliminate edit.js 2013-10-13 14:46:07 -07:00