Commit graph

343 commits

Author SHA1 Message Date
Tom Hughes
d101306d3b Update Polatch 2 to 2.3-407-g55bf495 build 2012-06-30 19:33:51 +01:00
Tom Hughes
b0453833b1 Replace use of Layer.GML with Layer.Vector 2012-06-28 18:18:42 +01:00
Tom Hughes
bad28a6478 Update OpenLayers to 2.12 2012-06-28 10:48:56 +01:00
Tom Hughes
2e412a645c Potlatch 2 localisation updates 2012-06-28 09:58:13 +01:00
Tom Hughes
7031a5d344 Update Polatch 2 to 2.3-403-gd7a64b0 build 2012-06-28 09:56:39 +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
8d66a63341 Update Potlatch 2 to 2.3-396-g24ec597 build 2012-05-24 11:06:37 +01:00
Tom Hughes
146179287f Update Potlatch 2 to 2.3-393-gd6503c3 build 2012-05-21 19:12:15 +01:00
Tom Hughes
e60eb7e75a Potlatch 2 localisation updates 2012-05-21 19:11:41 +01:00
Tom Hughes
ca3baf15be Update Potlatch 2 to 2.3-390-g71b0be0 build 2012-05-13 14:26:30 +01:00
Tom Hughes
a219a2e2a0 Potlatch 2 localisation updates 2012-05-13 14:26:30 +01:00
Tom Hughes
7ffc0be014 Update Potlatch 2 to 2.3-388-g7902b3f build 2012-05-08 10:56:02 +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
dd5635204e Polatch 2 localisation updates 2012-04-15 22:34:57 +01:00
Tom Hughes
9dea6b3739 Update Potlatch 2 to 2.3-380-gd20f3c8 build 2012-04-09 20:32:30 +01:00
Tom Hughes
823c7840db Update Potlatch 2 to 2.3-375-g9f05171 build 2012-03-30 13:50:46 +01:00
Tom Hughes
c6310fdcbd Update Potlatch 2 to 2.3-371-ga5f763a build 2012-03-27 11:55:29 +01:00
Tom Hughes
c7b3ba447f Load Potlatch 2 through the asset pipeline 2012-03-25 23:15:19 +01:00
Tom Hughes
4c612f6f4d Move swfobject to the vendor assets tree 2012-03-25 22:49:23 +01:00
Tom Hughes
eb789dbf75 Show an animation while a preview is loading 2012-03-17 16:36:58 +00:00
Tom Hughes
b6163f0fc2 Grow text areas automatically in response to input 2012-03-17 16:36:57 +00:00
Tom Hughes
5feb99d333 Remove OsmaRender layer class 2012-03-12 22:45:42 +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
ec0c1dfd47 Use the rails-i18n gem instead of local copies of locale data 2012-02-29 00:25:18 +00:00
Tom Hughes
2d2b6d7ed8 Remove ancient (and unused) composite_primary_keys gem 2012-02-15 17:48:17 +00:00
Tom Hughes
4de07696d5 Turn session-persistence plugin into a library 2012-02-15 17:48:15 +00:00
Tom Hughes
682ccc18df Switch to using deadlock_retry as a gem 2012-02-15 17:48:15 +00:00
Tom Hughes
e70396d70b Replace the file_column plugin with paperclip 2012-02-15 17:48:15 +00:00
Tom Hughes
29c1bab0e6 Turn output_compression plugin into a library 2012-02-15 17:48:15 +00:00
Tom Hughes
ca8e1bf188 Turn classic_pagination plugin into a library 2012-02-15 17:48:15 +00:00
Tom Hughes
10fb373e5e Switch to using http_accept_language as a gem 2012-02-15 17:48:15 +00:00
Tom Hughes
590eb85ee1 Prefer an exact language match over a prefix match 2012-02-14 15:26:01 +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
3b20c87893 Allow the export box to be moved and resized
Use the new OpenLayers TransformFeature control to allow any box
drawn by the user to select an export area to be moved or resized
after it is drawn.
2012-01-02 16:34:47 +00:00
Tom Hughes
ae9131bc8e Allow OpenStreetMap.js to work with an unpatched OpenLayers 2011-12-31 00:25:04 +00:00
Tom Hughes
283f4b922c Load the 404 tile through the URL rewriter 2011-12-30 22:19:45 +00:00
Tom Hughes
da78800060 Patch OpenLayers to make URL rewriting easier
This provides a single routine that can be overridden to rewrite
all image URLs to use the asset pipeine.
2011-12-30 18:32:53 +00:00
Tom Hughes
a2563bd6eb Update rails translations 2011-12-29 15:23:21 +00:00
Tom Hughes
727068eea5 Update rails translations 2011-12-18 13:08:00 +00:00
Tom Hughes
3e65a59b7a Update rails translations 2011-11-26 14:41:40 +00:00
Tom Hughes
716262f211 Serve OpenLayers through the asset pipeline 2011-11-25 20:07:50 +00:00
Tom Hughes
93fded9641 Drop the sql_session_store plugin
The sql_session_store plugin doesn't work with rails 3 and doesn't
seem to be supported anymore, so drop it in favour of the builtin
database backed session storage.
2011-11-14 09:42:55 +00:00
Tom Hughes
4cba7a971e Use the dynamic_form plugin as a gem 2011-11-14 09:42:54 +00:00
Tom Hughes
e7b47374e7 Update rails translations 2011-11-14 09:42:54 +00:00
Tom Hughes
8d520578a1 Make http_accept_language work with rails 3.1.0 2011-11-14 09:42:52 +00:00
Tom Hughes
ba97fca4f2 Switch to using the gem version of open_id_authentication 2011-11-14 09:42:50 +00:00
Tom Hughes
90a7efcf4d Use validates_email_format_of as a gem instead of a plugin 2011-11-14 09:42:46 +00:00
Tom Hughes
a543e731c0 Switch to using the rails-i18n-updater gem instead of the rails-i18n plugin 2011-11-14 09:42:44 +00:00