Commit graph

512 commits

Author SHA1 Message Date
Tom Hughes
3478c5b71f Update Potlatch 2 to 2.3-446-gf5ffc13 build 2012-09-03 09:01:38 +01:00
Tom Hughes
7b626f31be Use augment.js for improved cross browser compatibility
Remove the quick hack for that I added for Array.forEach and pull
in augment.js instead to add missing JS methods to older browsers.
2012-08-29 12:29:47 +01:00
Tom Hughes
96a4fb0805 Potlatch 2 localisation updates 2012-08-28 11:54:12 +01:00
Tom Hughes
2ce968b571 Update Potlatch 2 to 2.3-443-g151b833 build 2012-08-22 22:52:27 +01:00
Tom Hughes
6206ab7fe7 Add OpenLayers.Format.QueryStringFilter to the OpenLayers build 2012-08-22 21:50:48 +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
755162d66e Potlatch 2 localisation updates 2012-08-20 21:29:56 +01:00
Tom Hughes
a8396f8871 Update Potlatch 2 to 2.3-438-g86fce48 build 2012-08-15 19:22:53 +01:00
Tom Hughes
c93745af0c Potlatch 2 localisation updates 2012-08-10 12:28:16 +01:00
Tom Hughes
9a7f93ecd9 Update Potlatch 2 to 2.3-430-g8cee913 build 2012-08-10 12:27:53 +01:00
Tom Hughes
c5986fcc34 Potlatch 2 localisation updates 2012-08-02 19:31:02 +01:00
Tom Hughes
9950451395 Update Potlatch 2 to 2.3-425-g81ca535 build 2012-08-02 19:29:15 +01:00
Tom Hughes
6235025f19 Update Potlatch 2 imagery sources 2012-07-29 22:24:55 +01:00
Tom Hughes
146ad0146a Update Potlatch 2 to 2.3-419-gbf71353 build 2012-07-27 12:13:10 +01:00
Sarah Hoffmann
d97d3f76a6 Replace PanZoom control with Zoom control for small maps
In OpenLayers 2.12 the event handling of PanZoom and PanZoomBar clashes
with the result that the zoom level changes by two steps every time one
of the zoom buttons is pressed. Using the Zoom control fixes this issue.
2012-07-16 18:05:02 +01:00
Tom Hughes
b2723c536a Update Potlatch 2 to 2.3-415-g05324af build 2012-07-07 20:32:31 +01:00
Tom Hughes
fd594dc82f Update Potlatch 2 to 2.3-413-gca0fe9b build 2012-07-03 19:08:51 +01:00
Tom Hughes
5544944875 Update Potlatch 2 to 2.3-410-g6fec11f build 2012-07-03 12:49:26 +01:00
Tom Hughes
58583283d8 Potlatch 2 localisation updates 2012-06-30 19:34:38 +01:00
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