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

102 commits

Author SHA1 Message Date
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
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
41a123334b Switch to using oauth-plugin as a gem 
Use the oauth-plugin as a gem instead of carrying a local copy.

This also required that commit eff06faf46 be
reverted as it changed the plugin. I don't think the cosmetic improvement
from that patch is worth the hassle of carrying local changes to the plugin.
 2010-05-24 12:58:27 +01:00
Tom Hughes
6e7acd171f Pull in some upstream updates to http_accept_language 2010-05-24 12:10:46 +01:00
Tom Hughes
473dbfeede Add missing specification file to ROTS gem 2010-05-17 00:27:11 +01:00
Tom Hughes
a108e9290c Update OpenID authentication plugin to latest version 2010-05-16 10:41:23 +01:00
Tom Hughes
b4c1435655 Require yaml so ROTS works 2010-05-13 12:08:29 +01:00
Tom Hughes
58499290eb Add ROTS gem to vendor tree as it's not in the public GEM repos 2010-05-13 12:07:31 +01:00
Ævar Arnfjörð Bjarmason
441b92c3c3 Merge branch 'master' into openID 2010-05-02 08:57:50 +00:00
Tom Hughes
b2c3c8e710 Updated rails translations from http://github.com/svenfuchs/rails-i18n 2010-04-30 09:18:35 +01:00
Tom Hughes
d36fab2913 Merge branch 'master' into openid 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/login.html.erb
	config/locales/en.yml
 2010-04-20 00:41:03 +01:00
Tom Hughes
a36185b22f Normalise line endings. 2010-04-19 15:17:18 +01:00
Tom Hughes
7a4c88e7c8 Merge duplicate "support" keys. 2010-04-19 14:28:03 +01:00
Teemu Koskinen
400b27a196 Add Finnish translations for words_connector, two_words_connector and last_word_connector 2010-04-19 14:28:03 +01:00
Tom Hughes
d3e4803333 Update Spanish rails translation from upstream. 2010-04-19 14:28:02 +01:00
Tom Hughes
aa6e6aed2e Add translation to date.abbr_day_names for Saturday. 2010-04-19 14:28:02 +01:00
Tom Hughes
3506381789 Rename no-NB and no-NN translations to the correct nb and nn codes. 2010-03-18 21:47:02 +00:00
Tom Hughes
343afa7097 Update rails translations. 2010-03-18 21:36:15 +00:00
Richard Fairhurst
b8301cda40 yay for case-insensitive systems 2010-03-07 21:44:37 +00:00
Kai Krueger
bbf30e76e4 merge 19889:20181 of rails_port into the openID branch 
merge conflicts with the remember_me functionality
 2010-02-27 11:21:15 +00:00
Tom Hughes
aefc5f5112 Add email validation plugin from: 
git://github.com/dancroak/validates_email_format_of.git
 2010-02-25 19:14:50 +00:00
Tom Hughes
60f145f13e Add a plugin to handle session persistence. This is based on the 
plugin at http://github.com/augustl/session-persistence but modified
to work with rails 2 rather than rails 3.
 2010-02-25 16:39:51 +00:00
Kai Krueger
58bb08aba8 Add the open_id_authentication plugin 
The plugin is taken from http://github.com/rails/open_id_authentication
commit 079b91f70602814c98d4345e198f743bb56b76b5 

This plugin provides some convenience wrapper functions around
the ruby gem ruby-openid
 2010-01-10 17:34:00 +00:00