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

1422 commits

Author SHA1 Message Date
Tom Hughes
b4caac4d49 Improve handling of HTTP errors in search 
Fixes #969
 2015-05-14 09:21:19 +01:00
Tom Hughes
dd4e766788 Redirect to the login page if auth failure has no origin 2015-04-16 11:16:18 +01:00
Tom Hughes
2111ace158 Prefer username/password to openid_url if both are set 2015-04-16 11:14:57 +01:00
Tom Hughes
eeb9866d50 Add support for Google OAuth2 authentication 
This replaces OpenID authentication, which is going away soon, but
provides an upgrade path where we can migrate users that already have
a Google OpenID setup to the new system transparently.
 2015-04-14 10:08:07 +01:00
Tom Hughes
2af0840ff3 Fix style issues found by new rubocop version 2015-04-14 09:38:24 +01:00
Tom Hughes
ce3eabc203 Remove unreachable code 2015-03-09 00:17:08 +00:00
Tom Hughes
23f568cf3a A few more edge cases 2015-03-08 23:02:04 +00:00
Tom Hughes
51c5be98f7 Test some missing cases in the way controller 2015-03-08 18:01:19 +00:00
Tom Hughes
f8de0c1811 Ever more tests... 2015-03-08 16:47:35 +00:00
Tom Hughes
7fef0353f2 More test work 2015-03-08 00:48:13 +00:00
Tom Hughes
93fb360a08 Add a few more tests 2015-03-07 00:50:35 +00:00
Tom Hughes
21d60e359a Tests! 2015-03-04 21:49:43 +00:00
Tom Hughes
c0e4394a48 Add extra tests for API and redaction controllers 2015-03-03 00:55:19 +00:00
Tom Hughes
15b550182c Yet more tests... 2015-03-02 21:20:01 +00:00
Tom Hughes
e2609b9758 Remove unused code 2015-03-02 00:07:13 +00:00
Tom Hughes
1891efef06 Testing, testing, testing... 2015-03-01 23:05:32 +00:00
Tom Hughes
33790824d6 Use Faraday in place of Net::HTTP so we can mock responses 2015-03-01 19:22:46 +00:00
Tom Hughes
fd588cd715 The test train rolls ever onwards... 2015-03-01 17:04:39 +00:00
Tom Hughes
66efc5f1ec Remove unused method 2015-03-01 16:17:08 +00:00
Tom Hughes
9fb8f5a84b Drop the old output_compression plugin 
The production servers all have mod_deflate enabled anyway, which
almost certainly does a better job of compression than this.
 2015-03-01 10:52:28 +00:00
Tom Hughes
bc056a5e98 More test coverage improvements 2015-03-01 00:44:32 +00:00
Tom Hughes
857f0f460b More work on test coverage 2015-02-28 00:45:56 +00:00
Tom Hughes
dbe165bbb3 Fix some rubocop rails style issues 2015-02-26 00:12:54 +00:00
Tom Hughes
e434cb154c Convert OpenID authentication to generic third party authentication 2015-02-25 01:07:23 +00:00
Tom Hughes
b0150caee6 Convert OpenID authentication to use OmniAuth 2015-02-25 01:07:23 +00:00
Tom Hughes
a6b84a0294 Fix more rubocop style issues 2015-02-24 23:12:02 +00:00
Tom Hughes
8e404f3a46 Fix some more rubocop style issues 2015-02-20 20:39:52 +00:00
Tom Hughes
dc2a2c8ebd Standardise on double quoted strings 2015-02-20 19:47:26 +00:00
Tom Hughes
5cbd4038ed Fix rubocop style issues 2015-02-20 08:56:16 +00:00
Tom Hughes
baf10cd392 Fix rubocop lint issues 2015-02-20 08:56:16 +00:00
Tom Hughes
ef7f3d800c Fix most auto-correctable rubocop issues 2015-02-20 08:56:16 +00:00
Tom Hughes
34e3e51456 Cleanup trailing whitespace 2015-02-20 08:56:16 +00:00
Tom Hughes
098f8e98f2 Avoid mixed content warnings when routing queries Nominatim 2015-02-16 21:46:54 +00:00
Tom Hughes
13d650e2dc Merge branch 'master' into routing 2015-02-01 11:32:02 +00:00
Thijs Alkemade
17f926fefb Fix two issues with the remember_me_openid button 
1. It didn't work, the code only checked the remember_me button, not
   the remember_me_openid button.

2. It did not have a unique id, making the label next to it not work
   for selecting the checkbox.
 2015-02-01 10:33:45 +00:00
Matt Amos
c3e2e6462f Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2 
Conflicts:
	config/locales/de.yml
 2015-01-26 13:14:58 +00:00
Tom Hughes
046fbdc177 Replace deprecated reset method with restore method 2015-01-11 12:53:06 +00:00
Tom Hughes
360d68ea5c Replace deprecated deliver method with deliver_now 2015-01-11 12:53:06 +00:00
Tom Hughes
316ebb7570 Don't pass ActiveRecord objects to find and exists? 2015-01-10 12:41:16 +00:00
Tom Hughes
4e6fe811a0 Don't render the offline page for XHR requests 2014-12-14 00:32:50 +00:00
Tom Hughes
a6c24e3e5b Query mode doesn't need the database 2014-12-14 00:18:46 +00:00
Tom Hughes
36592f72bc Fix exception when message limit is hit 2014-12-02 21:29:12 +00:00
Tom Hughes
eb6b1ae733 Don't paginate redactions 
The index view doesn't render any pagination controls, and there
aren't enough redactions for pagination to be necessary yet.

Fixes #735
 2014-11-19 00:11:51 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge 
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
 2014-11-10 16:14:06 +00:00
Tom Hughes
260a690b3d Add comments_feed action to various filters 
Fixes #825
 2014-11-05 20:34:45 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing 
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
 2014-11-03 11:08:13 +00:00
Tom Hughes
8598db3233 Tidy up changeset comment code 2014-10-23 21:24:51 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions 
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
 2014-10-23 21:24:51 +01:00
Tom Hughes
96e1665c01 Update to rails 4.1.6 2014-10-02 19:54:21 +01:00
Paul Norman
2d26d1f764 Add an imagery blacklist to capabilities 
This blacklist is for imagery which is of an incompatible license or ToS
but is incorrectly used with some frequency.

This adds a <policy> element to the capabilities XML which contains the
blacklist information within it
 2014-08-31 18:41:12 +01:00