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

43 commits

Author SHA1 Message Date
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
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
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
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
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
Grant Slater
c7ffb35e8b Correct some minor html validation errors 2011-05-22 16:16:44 +01: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
7298467306 Fix scoping of reverse geocode result 2010-07-23 00:53:36 +01:00
Tom Hughes
51195c450d Add support for CSS based control of user specific components 
Define some helper routines which can be used to make page elements
only display when the logged in user matches certain conditions and
add style rules to the layout to trigger those elements based on the
logged in user.
 2010-07-21 21:49:20 +01:00
Tom Hughes
68368118a6 Add timeout to describe_location and handle exceptions 2010-06-19 07:53:22 +01:00
Tom Hughes
d516198bbe Update to rails 2.3.8 
Update site to use rails 2.3.8 which also allows us to drop the
globalize2 plugin as the core rails i18n code can now do fallback
and pluralization.
 2010-05-26 19:54:10 +01:00
Tom Hughes
94f19ce3b3 Use a better HTML sanitizer that makes sure the HTML is well formed and 
can add rel="nofollow" to links.
 2010-03-06 15:38:13 +00:00
Tom Hughes
3e8d809250 Add user images to diary view. 2010-02-28 00:24:33 +00:00
Tom Hughes
ec172871ae If Nominatim can't give us a location, just return the coordinates. 2010-02-27 12:58:23 +00:00
Tom Hughes
0b913efd05 Use Nominatim to reverse geocode diary location information and display 
a friendly human readable location instead of some coordinates.
 2010-02-27 12:41:56 +00:00
Tom Hughes
d963aa30b7 Add rel=nofollow to links in tags. Closes #2555. 2009-12-14 09:09:32 +00:00
Tom Hughes
41dfa42edd Sanitize any user supplied HTML before doing link detection or the 
sanitizer will strip the rel=nofollow attributes.
 2009-11-14 16:31:51 +00:00
Tom Hughes
17445a44da Make rel=nofollow actually work - when in doubt trust the source as 
the rails documentation speaks with forked tongue.
 2009-11-14 16:15:26 +00:00
Tom Hughes
6bfa897cfc Add nofollow to user provided links. 2009-11-14 15:11:57 +00:00
Tom Hughes
e0cbfe24a5 Escape non-ascii characters in exported HTML. Closes #2075. 2009-10-27 00:59:38 +00:00
Tom Hughes
fb9789929c Fix output of javascript strings - use english strings to walk the 
tree but output strings in the correct locale. Closes #2362.
 2009-10-08 12:25:55 +00:00
Tom Hughes
f4dba81b64 Modify the existing i18n() javascript function to lookup strings in 
the javascript i18n array as well as expanding arguments, and make all
lookups go through it.
 2009-10-02 23:41:19 +00:00
Tom Hughes
596ab82461 Move javascript translations to a separate key based on the path to 
the javascript file that uses them and amend the layout to automatically
find and output all javascript strings.
 2009-10-02 23:33:17 +00:00
Tom Hughes
b450ce9d85 Fix links to changeset feeds. 2009-07-04 12:12:05 +00:00
Tom Hughes
5bc80823ec Tidy up RSS links a bit. 2008-04-23 17:39:09 +00:00
Tom Hughes
c3bd1f113b Tidy up message sensitisation a bit more, and add sensitisation of 
information in the diary RSS feeds.
 2008-01-16 10:02:42 +00:00
Steve Coast
b4c0bfd8fa more basic framework 2006-07-28 21:53:30 +00:00