Commit graph

124 commits

Author SHA1 Message Date
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
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
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
Tom Hughes
b2e9d8176b Go back to the rails 3 based upstream version of session-persistence 2011-11-14 09:42:44 +00:00
Tom Hughes
63862d008e Update validates_email_format_of plugin 2011-11-14 09:42:43 +00:00
Tom Hughes
14ba9f0a37 Fix some deprecation warnings in the file_column plugin 2011-11-14 09:42:43 +00:00
Tom Hughes
f50ef32743 Add the dynamic form plugin to get error_messages_for support back 2011-11-14 09:42:42 +00:00
Tom Hughes
3e8f20fbed Remove old process management scripts 2011-09-29 00:56:28 +01:00
Tom Hughes
ce7b651eb2 Merge branch 'master' into openid 2011-06-10 19:11:08 +01:00
Tom Hughes
26b217c0ad Work round session expiry bug in rails 2.3.11
Rails uses :expire_after in the session options to specify when a
sesssion should expire, but when Rack sets the cookie it expects to
see :expires in the cookie options but Rails 2.3.11 fails to do the
conversion so doesn't set the cookie expiry.

To work around this, we set both options in the session options...
2011-06-02 10:23:22 +01:00
Tom Hughes
652dbf5044 Merge branch 'master' into openid
Conflicts:
	config/locales/en.yml
2011-05-31 19:10:31 +01:00
Tom Hughes
bf8bbdc220 Update rails translations 2011-05-31 18:11:31 +01:00
Tom Hughes
beeb77721f Update to Rails 2.3.11
Update the site to use Rails 2.3.11 which also required switching to
the new syntax for interpolated variables in translation strings.
2011-05-31 18:11:31 +01:00
Kai Krueger
478691c596 Disable logging when --silent is used 2010-12-05 16:20:59 +00:00
Tom Hughes
94f9f4b76f Pass any AX response to the callback along with the SReg response 2010-10-03 14:24:45 +01:00
Tom Hughes
f70feedc65 Merge branch 'master' into openid 2010-09-24 09:35:36 +01:00
Tom Hughes
c08f9a2f03 Remove oauth-plugin from vendor and require gem version instead 2010-09-21 16:20:30 +01:00
Tom Hughes
6a3cadb52d Merge branch 'master' into openid 2010-06-16 21:18:44 +01:00
Tom Hughes
c38de8027f Correct name of ActiveRecord 2010-06-15 17:12:55 +01:00
Tom Hughes
8af14faa49 Make database offline mode work 2010-06-15 10:07:39 +01:00
Tom Hughes
dc35b597a2 Merge branch 'master' into openid
Conflicts:
	config/locales/is.yml
2010-06-07 22:24:24 +01:00
Tom Hughes
406b46e49b Revert "Switch to using oauth-plugin as a gem"
This reverts commit 41a123334b.
2010-06-07 16:01:04 +01:00