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

191 commits

Author SHA1 Message Date
Tom Hughes
d5e90c0d87 Add asset wrappers for iD 2015-02-11 19:18:13 +00:00
Tom Hughes
e65e41a694 Update to rails 4.2.0 2015-01-10 17:46:58 +00:00
Tom Hughes
428f379eef Restore removal of div and style elements when sanitizing HTML 2015-01-10 17:41:17 +00:00
Adam Conrad
9934eed190 Remove unnecessary local variable 
The local variable `app` was unused and therefore not needed
to be declared with initialization
 2014-12-08 07:59:49 +00:00
Tom Hughes
dae66c21d5 Update to CPK 7.0.11 and drop monkey patch 2014-10-10 12:32:25 +01:00
Tom Hughes
96e1665c01 Update to rails 4.1.6 2014-10-02 19:54:21 +01:00
Tom Hughes
2e29168986 Precompile expressInstall.swf 2014-08-06 08:58:47 +01:00
Tom Hughes
3ca29a8dc7 Precompile iD locales 2014-07-25 18:44:57 +01:00
Tom Hughes
0b9bf8d816 Force the path to be treated as UTF-8 2014-07-22 15:13:36 +01:00
Tom Hughes
6a198d47aa Make sure all environment can see asset precompilation rules 2014-07-04 19:24:25 +01:00
Tom Hughes
17ce58df35 Update postgres connection adaptor patches 2014-07-04 19:24:25 +01:00
Tom Hughes
bd402599f5 Update to rails 4.1.1 2014-07-04 19:24:25 +01:00
John Firebaugh
665abc501c Use Konacha for testing JavaScript 2014-02-27 16:03:22 +00:00
Tom Hughes
933b091330 Highlight erroneous fields by adding a class to them 
The default rails scheme for highlighting errors is to wrap the
field in a div, but that changes the structure of the page and can
change the meaning of CSS rules applied to the fields.

As an alternative we now apply a class to the fields, and use that
in the CSS to apply a highlight.
 2014-01-15 21:41:16 +00:00
Tom Hughes
de9d26c7df Drop redundant monkey patches 2013-12-08 22:49:31 +00:00
Tom Hughes
cc4bca22b0 Update to rails 4.0.2 2013-12-03 21:09:10 +00:00
Tom Hughes
aff0583a34 Drop monkey patch now we're using option style redirects 
Option style redirects escape path parameters correctly, so we
can drop out monkey patch.
 2013-12-01 20:54:52 +00:00
Tom Hughes
e73a770d81 Remove monkey patch which has been merged upstream in rails 4 2013-11-30 14:02:49 +00:00
Tom Hughes
309831a619 Monkey patch escaping in redirect routes 
The correct method of escaping depends on whether the parameter
is being substituted in the path or the query, but all our ones
are substitued in the path so use URI.escape instead of the
standard Rack::Utils.escape which does query escaping.

https://github.com/rails/rails/issues/13110
 2013-11-30 13:53:48 +00:00
Tom Hughes
d375caf7a3 Update to CPK 6.0.1 and drop monkey patch 2013-11-30 10:28:41 +00:00
Tom Hughes
b0936b87f4 Monkey patch composite_primary_keys to fix deletes via has_many 
https://github.com/composite-primary-keys/composite_primary_keys/pull/170
 2013-10-15 00:17:39 +01:00
Tom Hughes
0e9e6e6f8f Upgrade to http_accept_language 2.x 2013-09-24 20:22:44 +01:00
Tom Hughes
f289c1092c Fixup the paperclip asset URL handling for rails 4 support 2013-09-24 10:46:00 +01:00
Tom Hughes
7d993febee Avoid "unknown OID" warnings from Postgres driver 2013-09-23 11:41:35 +01:00
Tom Hughes
5208b7e3af Configure page caching in the production environment 2013-09-23 10:39:11 +01:00
Tom Hughes
b0bc04abf1 Configure the page cache 2013-09-23 10:07:23 +01:00
Tom Hughes
537cd6a52c Fix typo in session store configuration 2013-09-23 09:58:31 +01:00
Tom Hughes
255b0b9425 Drop memcached and use dalli as the memcache client 2013-09-22 15:57:22 +01:00
Tom Hughes
90048d87d6 Ignore exceptions clearing sessions 
Rails 3 sessions can't be loaded by rails 4 but reset_session also
fails because it tries to clear the session, which tries to load it
in to clear it.

So monkey patch the session to ignore exceptions during clear so
that out normal reset-on-exception logic will reset the session.
 2013-09-22 10:33:31 +01:00
Tom Hughes
36c220ca2b Monkey patch PostgreSQLAdapter to make enums work 2013-09-21 11:35:45 +01:00
Tom Hughes
984c6dc114 Update to rails 4.0.0 2013-09-21 11:35:45 +01:00
Tom Hughes
26855add38 Rework piwik configuration 2013-08-24 12:54:51 +01:00
Tom Hughes
f78c703708 Simplify locale handing in notification emails 2013-05-27 10:53:14 +01:00
Tom Hughes
898cc828dd Merge branch 'master' into notes 
Conflicts:
	Gemfile.lock
 2013-03-28 00:36:07 +00:00
Tom Hughes
d53bbe53f4 Mark CORS responses as uncacheable 2013-03-25 21:50:26 +00:00
Tom Hughes
30f8e412bc Wait until after rails has initialise I18n to preload the resources 2013-03-25 12:50:18 +00:00
Tom Hughes
652b09b4d1 Force translations to be preloaded during startup 2013-03-25 10:49:58 +00:00
Tom Hughes
8090e086da Merge branch 'master' into notes 2013-02-05 19:03:28 +00:00
Tom Hughes
3374f50a5d Drop secret_token as we don't use it and it confuses people 2013-02-03 12:23:37 +00:00
Tom Hughes
ff73d12255 Make notes RSS feeds work 2013-02-02 17:48:56 +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
8f02fe8269 Update to CPK 5.0.10 and remove monkey patch 2012-11-22 09:10:04 +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
d68368e0d5 Rework RTL handling to keep rules together 2012-11-19 10:39:30 +00:00
Tom Hughes
2cecfa7d01 Configure CORS to allow GET and POST to /oauth 2012-11-16 22:28:52 +00:00
Tom Hughes
9bc3196dee Monkey patch field_changed? support until CPK is updated 2012-11-12 19:15:20 +00:00
John Firebaugh
7751973871 Allow cross-origin requests to API 2012-10-22 19:11:52 +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
05b4406c14 Remove monkey patch for I18n which is no longer needed 2012-09-30 14:07:41 +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