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

1400 commits

Author SHA1 Message Date
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
Tom Hughes
042ecee695 Don't preload the nodes as it seems to break the ordering 
Fixes #795
 2014-07-29 10:14:08 +01:00
Tom Hughes
c53db246f6 Merge branch 'rails41' 2014-07-21 08:53:44 +01:00
Tom Hughes
6cb01999c6 Remove debug statement 2014-07-04 19:58:03 +01:00
Tom Hughes
dd81b09eba Update for API change in CPK 7.x 2014-07-04 19:24:25 +01:00
Tom Hughes
28bfb9999f Rename Trace#public to Trace#visible_to_all 2014-07-04 19:24:25 +01:00
Tom Hughes
56d39b06f2 Rename User#public to User#identifiable 2014-07-04 19:24:25 +01:00
Tom Hughes
0cc579b287 Improve blocking of characters not allowed in XML 2014-06-19 00:25:18 +01:00
Tom Hughes
c9e9ef1a89 Rewrite layer parameters in shortlinks correctly 
Fixes #762
 2014-06-17 21:15:36 +01:00
Tom Hughes
6fe824bd0b Strip illegal characters from member roles in AMF uploads, part 2 
Fixes #758
 2014-06-15 15:55:30 +01:00
Tom Hughes
4cd7f5ad0d Strip illegal characters from member roles in AMF uploads 
Fixes #758
 2014-06-15 15:50:31 +01:00
Tom Hughes
d27cc80b43 Use the exclusion list returned by nominatim 
When constructing a "more results" link for nominatim, use the
exclusion list returned by the previous query instead of trying
to make on up ourselves.

Fixes #701
 2014-06-15 15:20:50 +01:00
Tom Hughes
5a830b2845 Don't force a login to use a remote editor 
Fixes #754
 2014-06-15 11:00:49 +01:00
Tom Hughes
098c2675ba Add support for ACL blocks on note commenting 2014-06-03 20:59:25 +01:00
John Firebaugh
f2bf38606e Permalinks for directions 2014-05-14 15:52:25 -07:00
Tom Hughes
f9ae6d252f Drop the slim layout 
The slim layout is not really needed since the redesign as the
pages it was used for in the OAuth flow now have less chrome and
work fine on small screens with the normal layout.

Fixes #689
 2014-02-16 16:03:00 +00:00
Tom Hughes
47841829d8 Improve redirection of shortlinks 
If a shortlink includes an object reference then redirect to a new
style browse URL for that object.

Fixes #702
 2014-02-15 12:42:52 +00:00
Tom Hughes
25b93471c1 Preserve message details over validation errors 
If a validation error occurs while saving a message then make
sure the values are preserved in the new form.
 2014-02-04 22:31:44 +00:00
Tom Hughes
339ac9d239 Pass preferred language to geonames API calls 2014-01-27 21:14:17 +00:00
Tom Hughes
ccebb796ab Use api.geonames.org for reverse searches 2014-01-27 21:14:17 +00:00
Toby Murray
c78853a97e Changing the note search limit from 9999 to 10000 
The documentation says the limit is 10000 which seems like a
nicer round number anyway.
 2014-01-19 13:40:11 +00:00
Tom Hughes
45618726ef Reenable the note search API 
Add a postgress freetext index on the note comments, and enable
note searching using freetext matching.
 2014-01-15 19:58:58 +00:00
Tom Hughes
1e2b99a75b Disable notes search until it can be made scalable 2014-01-09 08:41:59 +00:00