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

522 commits

Author SHA1 Message Date
Tom Hughes
c809f79912 Tidy up user preferences controller 2013-05-10 16:03:37 +01:00
John Firebaugh
3da2a95cea Update iD, set locale 2013-05-03 13:47:30 -07:00
Tom MacWright
7a98913d0c Add iD editor 
iD sources live in vendor/assets/iD, and are managed with
vendorer, using the "rewrite" functionality to replace relative
paths in the CSS with <%= asset_path(…) %> directives.

To avoid needing to namespace all of its CSS classes, iD
is embedded via an iframe.

To setup, edit application.yml to include an `id_key` key.
(It can use the same consumer key as P2 if you like.)
 2013-05-03 10:52:41 -07:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
b2721f3207 Map Serbian locales to Potlatch 2 correctly 2013-02-25 09:58:45 +00:00
Tom Hughes
ae27f7adbe Make the API reject changes to closed notes 2013-02-05 18:08:42 +00:00
Tom Hughes
ff73d12255 Make notes RSS feeds work 2013-02-02 17:48:56 +00:00
Tom Hughes
56db9ca2b7 Merge branch 'master' into notes 2013-02-02 11:00:46 +00:00
Tom Hughes
a77b0e45a5 Update Potlatch 2 translations 2013-02-02 10:58:32 +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
8ca9f5a0d5 Potlatch 2 localisation updates 2012-12-21 08:49:39 +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
5fe5777a58 Move caching of reverse geocodes to describe_location 2012-12-01 18:18:10 +00:00
Tom Hughes
9dfb2729ab Revert "Use Redcarpet::Render::XHTML instead of our custom renderer" 
This reverts commit 4bb95b3773.
 2012-11-29 22:22:22 +00:00
Tom Hughes
4bb95b3773 Use Redcarpet::Render::XHTML instead of our custom renderer 
Now that my :link_attributes patch has been merged we don't need
the custom renderer to add the rel=nofollow attributes.
 2012-11-29 18:59:43 +00:00
Tom Hughes
593e3af303 Potlatch 2 localisation updates 2012-11-27 09:39:22 +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
0472e6cad4 Only call force_encoding on ruby 1.9 2012-11-12 20:19:07 +00:00
Tom Hughes
373a610563 Force encoding in AMF controller 
Although the strings are UTF-8 we need to treat them as byte
strings for the purposes of encoding AMF responses.
 2012-10-31 20:39:31 +00:00
Tom Hughes
b7967002d8 Potlatch 2 localisation updates 2012-10-21 19:27:21 +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
99a2b549d4 Drop renaming of sequences 
Rails seems to rename sequences automatically now when the
corresponding table is renamed, so we don't need to do it.
 2012-10-13 11:49:37 +01:00
Richard Fairhurst
8438ce7779 Remove Potlatch 1 from edit menu 2012-10-12 21:05:29 +01:00
Tom Hughes
a6c900726d Update Potlatch 2 to 2.3-465-g19866a9 build 2012-09-24 19:00:08 +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
Grant Slater
2805118a60 Add CC BY-SA 2.0 copyright/attribution/license attributes to <osm> 2012-09-11 18:46:37 +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
a8396f8871 Update Potlatch 2 to 2.3-438-g86fce48 build 2012-08-15 19:22:53 +01:00
Tom Hughes
c5986fcc34 Potlatch 2 localisation updates 2012-08-02 19:31:02 +01:00
Tom Hughes
49b3f8676a Update Potlatch 2 to 2.3-401-g5359f3d build 2012-06-18 13:34:22 +01:00
Tom Hughes
a5d4cc4e6b Potlatch 2 localisation updates 2012-05-27 13:56:50 +01:00
Tom Hughes
9813d9f1e4 Get all the tests passing under ruby 1.9 2012-05-27 13:51:25 +01:00
Tom Hughes
e60eb7e75a Potlatch 2 localisation updates 2012-05-21 19:11:41 +01:00
Tom Hughes
a219a2e2a0 Potlatch 2 localisation updates 2012-05-13 14:26:30 +01:00
Tom Hughes
eb1a831f4e Potlatch 2 localisation updates 2012-05-05 15:43:07 +01:00
Tom Hughes
510eefe752 Potlatch 2 localisation updates 2012-04-23 21:23:28 +01:00
Tom Hughes
9dea6b3739 Update Potlatch 2 to 2.3-380-gd20f3c8 build 2012-04-09 20:32:30 +01:00
Matt Amos
67182f824e Fixing review comments 
Added scoping for unredacted items, cleaned up authorization and
railsified old_node_controller.
 2012-04-05 13:46:40 +01:00
Matt Amos
67dd9e4c9d Adding first cut of Redactions support 
Redactions support hiding historical versions of elements and
collecting meta-data about that action together.
 2012-04-05 13:46:36 +01:00
Tom Hughes
f3c9f4edb4 Adjust spam scoring to try and reduce false positives 2012-03-20 13:28:57 +00:00
Tom Hughes
9492d20a87 Avoid dragging ActionView::Helpers::TextHelper into RichText objects 
Dragging in TextHelper gets us a truncate method which hides the one
we inherited from String and which we want.
 2012-03-19 12:01:02 +00:00
Tom Hughes
584806af92 Add rel="nofollow" to links generated from Markdown 2012-03-17 16:37:19 +00:00
Tom Hughes
98592e2903 Add a simple "text" format to the RichText module 2012-03-17 16:37:00 +00:00
Tom Hughes
8f4a9a4b87 Make spam scoring work with new rich text system 2012-03-17 16:36:58 +00:00
Tom Hughes
aa4205482a Treat all newly entered blocks of text as Markdown 2012-03-17 16:36:55 +00:00
Tom Hughes
7575f1ec0a Update Potlatch 2 to 2.3-224-g2df4b28 build 2012-03-12 20:27:32 +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
eaf6647553 Correct name of simplified Chinese locale 2012-03-04 17:44:50 +00:00
Tom Hughes
516c13a77b Update Potlatch 2 to 2.3-190-g0bb4cb3 build 2012-03-04 17:36:25 +00:00
Tom Hughes
e6af712eae Update Potlatch 2 to 2.3-153-gf0c9bef build 2012-03-04 10:48:24 +00:00