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

8778 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andy Allan
67a95ac7e9 Remove created_at / updated_at column definitions since these duplicate t.timestamps 2017-09-13 14:57:07 +01:00
Kshitiz Khanal
715759211a Add banner for State of the Map Asia 2017 
Closes #1630
 2017-09-08 16:54:39 +01:00
Wille Marcel
a402e811da Add padding between the last diary post and the pagination links 
Closes #1634
 2017-09-08 16:50:09 +01:00
Tom Hughes
e7e85db0c8 Update secure_headers configuration for upstream changes 2017-09-08 16:49:28 +01:00
Tom Hughes
448bdb2454 Update travis configuration to work on trusty based builders 
Switch to postgres 9.5 and link postgres functions to a directory
that is accessible to the postgres server.
 2017-09-08 16:33:26 +01:00
Tom Hughes
d3a876f13a Update rails to 5.0.6 2017-09-08 15:27:14 +01:00
Andy Allan
c00c515d9d Ensure report details are not blank. 2017-09-06 18:17:54 +01:00
Andy Allan
d7612f42d0 Refactor creating a new report to use a ReportsController 
It's really a report that the user is creating, the issue is created indirectly. Similar
refactoring will be required for issue comments.
 2017-09-06 18:06:21 +01:00
Andy Allan
948fd8c8fa Use reports_count so that counter_cache works automatically. 2017-09-06 17:57:54 +01:00
Andy Allan
b578cee759 Remove the border around the radio boxes 
It looks strange.
 2017-09-06 16:27:54 +01:00
Andy Allan
4ff6027926 Check that the flag is not show when not logged in 2017-09-06 11:31:21 +01:00
Andy Allan
2b617b766a Add a basic feature test for reporting diary entries. 2017-09-06 11:26:32 +01:00
Andy Allan
47d8d79c99 Add minitest-rails-capybara 
This allows us to write feature tests using capybara. These can be
easily changed to system tests when we upgrade to rails 5.1
 2017-09-06 11:21:00 +01:00
Tom Hughes
f1faffd4d1 Merge remote-tracking branch 'upstream/pull/1614' 2017-08-30 21:09:32 +01:00
Andy Allan
b4be5596f5 Rename xml processing methods with an update_ prefix 
They behave differently from the other from_xml methods on other models.
 2017-08-30 11:40:54 +01:00
Tom Hughes
33845759ac Enable retina tiles for Thunderforest layers 
Fixes #1623
 2017-08-29 20:28:39 +01:00
Bryan Housel
c7545691bb Update to iD v2.4.1 2017-08-26 16:08:43 -04:00
Bryan Housel
8d2acb8ef0 Add iD hashtags parameter 2017-08-25 16:24:19 -04:00
Bryan Housel
366a9e9097 Update to iD v2.4.0 2017-08-25 16:21:11 -04:00
Andy Allan
c647aa3d4d Refactor the from_xml methods to act on existing trace objects. 
Setting the new tags with the = operator takes care of removing the
old ones, and is the same approach as taken by the tagstring= method.

Fixes #1600
 2017-08-18 10:09:50 +01:00
Andy Allan
e9324ad681 Add failing test demonstrating tag duplication when updating traces via the API. 2017-08-17 19:03:50 +01:00
Tom Hughes
a70898be6d Make sure we show errors correctly when resetting a password 2017-08-11 17:45:57 +01:00
mmd-osm
7fd1e55938 Discard empty ways from query result geometries 
Fixes #1608
 2017-08-10 19:49:50 +01:00
Tom Hughes
ff7244d085 Update to leaflet 1.2.0 2017-08-09 22:48:56 +01:00
Tom Hughes
9ed1fe2d78 Fix rubocop warning 2017-08-03 19:08:54 +01:00
Tom Hughes
c7377c7f9f Switch to using openstreetmap-deadlock_retry 
Closes #1602
 2017-08-03 18:41:45 +01:00
Tom Hughes
e2367194b7 Merge remote-tracking branch 'upstream/pull/1604' 2017-08-02 15:38:21 +01:00
Andy Allan
efab85fe67 Add maintainers to README 
It's nice to be explicit, so that new contributers know who is who.

While github shows "owner" and "member" labels these are for the
openstreetmap organisation as a whole, and can be misleading.
 2017-08-02 15:34:17 +01:00
Tom Hughes
85b0098b1c Make sure the account form is POSTed 
Fixes #1601
 2017-08-02 15:32:13 +01:00
Andy Allan
60f2074bac Merge pull request #1588 from Georeactor/master 
Update gem, fix icons on RTL/Arabic pages
 2017-08-02 15:15:25 +01:00
Tom Hughes
bc10bc8758 Merge remote-tracking branch 'upstream/pull/1603' 2017-08-02 15:02:39 +01:00
Andy Allan
980422533d Avoid passing the current_user.id when commenting 
Doing so doesn't appear to be necessary, and it opens up a spoofing
hole if it's actually used.
 2017-08-02 14:58:03 +01:00
Andy Allan
389095df1c Remove unused user save template. 
This template isn't used, since all the controller methods redirect
to other views.
 2017-08-02 14:48:04 +01:00
Andy Allan
3e4255eb2c Use current_user instead of @user. 2017-08-02 12:21:51 +01:00
Andy Allan
e31376e28d Merge branch 'master' into moderation 2017-08-02 12:12:57 +01:00
Tom Hughes
f258af223b Fix user settings form 
Fixes #1601
 2017-08-01 19:25:07 +01:00
Tom Hughes
72fb2062b5 Update to rails 5.0.5 2017-07-31 21:55:40 +01:00
Tom Hughes
4bd49a8cd7 Update bundle 2017-07-31 21:55:32 +01:00
Tom Hughes
8c513beec6 Update rack-cors and fix tests for changes in behaviour 2017-07-31 21:55:01 +01:00
Andy Allan
aa821971dd Merge pull request #1597 from tomhughes/current-user 
Complete @user to current_user transition
 2017-07-28 12:42:33 +01:00
Tom Hughes
ebeea34670 Replace @user with @current_user 
This ensures that that we will find any more hidden references
to @user that might be hanging around...
 2017-07-27 19:44:14 +01:00
Tom Hughes
24fc94944b Change user forms to use current user instead of @user 2017-07-27 19:40:20 +01:00
Tom Hughes
2c9c427587 Convert @user to current_user in helpers 2017-07-27 19:27:17 +01:00
Tom Hughes
555a821c3e Merge remote-tracking branch 'upstream/pull/1595' 2017-07-27 19:18:31 +01:00
Andy Allan
09ba878519 Convert @user to current_user 2017-07-27 10:31:31 +01:00
Andy Allan
c819bec8b7 Use a current_user helper for accessing the logged in user in all views. 2017-07-27 10:07:51 +01:00
Andy Allan
41000078b9 Convert remaining controller code to use current_user 
The `self.current_user` is important when assigning to the current user,
to avoid creating a local variable called `current_user`
 2017-07-27 10:07:51 +01:00
Nick Doiron
de3e02d41a use no-r2 comment to block RTL gem from changing sprites 2017-07-26 09:15:07 -10:00
Bryan Housel
34a918c59e Update to iD v2.3.2 2017-07-24 18:55:40 -04:00
Christian Schmidt
f45f27627c Update to Leaflet.Locate 0.62.0 2017-07-21 20:51:16 +02:00