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

335 commits

Author SHA1 Message Date
Tom Hughes
5fe5777a58 Move caching of reverse geocodes to describe_location 2012-12-01 18:18:10 +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
6aaaf5dddb Rework signup emails a bit 
Remove "lego" strings and try and reduce duplication between the
text and HTML versions of the mails.
 2012-11-05 09:54:58 +00:00
John Firebaugh
c426e8d160 Make it easier to test RTL layout 
Instead of fiddling with settings so the site appears in Arabic
or Hebrew, you can add a dir=rtl param to the URL.
 2012-10-26 21:36:59 +01:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +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
Paweł Paprota
067ff20504 Match wikipedia language prefixes case insensitively 
Without this values like "PL:Article" are linked to the English Wikipedia.
 2012-10-07 16:03:10 +01:00
Paweł Paprota
8688edf992 Don't remove language prefixes from wikipedia tags 
Removing the language prefix from the displayed value of a wikipedia
tag is confusing, so don't do it. Fixes trac #4135.
 2012-10-07 16:01:50 +01:00
Tom MacWright
be8617dfdc Redesign inbox 
Cuts down on buttons, grey, and bold clutter.
 2012-10-02 19:34:49 +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
e2fed14ab8 Remove unused helper 2012-08-27 20:30:16 +01:00
Tom Hughes
7ad58d1411 Switch to using i18n-js for handling translations in javascript 2012-08-27 18:00:03 +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
fe8d5c0573 Move some helper functions to better homes 2012-08-12 16:14:35 +01:00
Tom Hughes
fb74074555 Remove empty helper files 2012-08-12 16:14:00 +01:00
Tom Hughes
344c5534ee Tidy up generation of UJS data attributes 2012-06-18 14:36:59 +01:00
Tom Hughes
2662e6fec2 Fix syntax error 2012-06-01 22:32:11 +01:00
Tom Hughes
490226ad6d Replace link_to_function with UJS based code 2012-06-01 19:34:22 +01:00
Matt Amos
ecf767ee4f Removed early return from printable name method 2012-04-05 13:53:41 +01:00
Matt Amos
c8d3257fa5 Stop the data browser leaking details of redactions 
Altered styling of redacted versions in changeset list so that they
appear deleted and don't leak tag information.
 2012-04-05 13:50:22 +01:00
Tom Hughes
75300566e1 Move generation of role icons into a helper 2012-03-21 19:20:40 +00:00
Tom Hughes
561f2f694a Add preview functionality to rich text controls 2012-03-17 16:36:57 +00:00
Tom Hughes
aa4205482a Treat all newly entered blocks of text as Markdown 2012-03-17 16:36:55 +00:00
Tom Hughes
2c397321c9 Refactor calculation of zoom level based on a scale 2012-03-14 19:12:32 +00:00
Tom Hughes
82cf356d85 Drop with_format and user the new :formats render option instead 2012-03-09 00:28:03 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs 
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
 2012-03-08 18:23:27 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
9f12d24fbd Leave https wikipedia URLs unmolested 2012-02-06 08:54:10 +00:00
Tom Hughes
3aa1c46aef Use OSM::Timer (and hence SystemTimer) consistently 2012-01-06 09:13:52 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs 
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
 2012-01-05 20:15:53 +00:00
Tom Hughes
13289d4041 Switch from Prototype to jQuery 2011-11-26 00:22:31 +00:00
Tom Hughes
75f12f5b18 Remove debugging code 2011-11-15 09:58:30 +00:00
Tom Hughes
45ec042c90 Mark sanitized text as HTML safe 2011-11-15 09:58:10 +00:00
Tom Hughes
1d6051d08b Make linkify preserve HTML safety 2011-11-15 09:46:33 +00:00
Tom Hughes
607d23f6d6 Fixup some string escaping issues in the data browser 2011-11-14 09:42:55 +00:00
Tom Hughes
e5c8dc9c77 Removed unused link_to_page from the trace helpers 
It was unused, and clashed link_to_page in the browser helpers as
apparently all helpers are loaded into all views...
 2011-11-14 09:42:55 +00:00
Tom Hughes
3377879d39 Add rinku to get auto_link support back 2011-11-14 09:42:52 +00:00
Tom Hughes
819badd55b Reflect move of u_unpack from Chars to Unicode 2011-11-14 09:42:43 +00:00
Tom Hughes
ed54379218 Make helpers return text instead of appending to the output buffer 2011-11-14 09:42:42 +00:00
Tom Hughes
22594361d5 Mark some strings that shouldn't be escaped as raw 2011-11-14 09:42:41 +00:00
Tom Hughes
82eedbf651 Improve formatting of note descriptions in GPX and RSS responses 2011-08-28 17:58:02 +01:00
Tom Hughes
81a6c7b7be Get the note browse pages into a vaguely working state 2011-08-13 13:25:41 +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
Grant Slater
c7ffb35e8b Correct some minor html validation errors 2011-05-22 16:16:44 +01:00
Tom Hughes
0ea9f92be5 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
 2010-12-05 15:15:55 +00:00
Tom Hughes
04a6c41be9 Show a popup listing available editors when hovering over the edit tab 2010-11-29 12:20:22 +00:00
Tom Hughes
c3453cf57d Make JOSM remote control based editing work 2010-11-29 12:20:22 +00:00
Tom Hughes
03fb042591 Merge branch 'master' into openid 2010-07-28 21:39:46 +01:00
Tom Hughes
7298467306 Fix scoping of reverse geocode result 2010-07-23 00:53:36 +01:00